Revision: 6627
          http://sourceforge.net/p/jump-pilot/code/6627
Author:   michaudm
Date:     2020-11-21 20:39:09 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Make it possible to read images with wrongly typed geotags like ones exported 
by Gimp

Modified Paths:
--------------
    
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoReferencedRaster.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoReferencedRaster.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoReferencedRaster.java
    2020-11-21 19:24:09 UTC (rev 6626)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoReferencedRaster.java
    2020-11-21 20:39:09 UTC (rev 6627)
@@ -164,7 +164,7 @@
       setEnvelope(tags);
     }
     // use the tiepoints as defined
-    else {
+    else if (fieldModelTiePoints.getType() == XTIFFField.TIFF_DOUBLE) {
       // Get the number of modeltiepoints
       // int numModelTiePoints = fieldModelTiePoints.getCount() / 6;
       // ToDo: alleen numModelTiePoints == 1 ondersteunen.
@@ -346,9 +346,11 @@
       // First, try to get the TIFF directory
       // Object dir = src.getProperty("tiff.directory");
       parseGeoTIFFDirectory(uri);
-      // still with us? must have succeeded
-      Logger.debug("XTIFF geo metadata fetched.");
-      return;
+      if (envModel_image != null) {
+        // still with us? must have succeeded
+        Logger.debug("XTIFF geo metadata fetched.");
+        return;
+      }
     } catch (ReferencedImageException e) {
       Logger.debug("XTIFF geo metadata unavailable: " + e.getMessage());
     }
@@ -355,7 +357,7 @@
 
     Logger.info("No georeference found! Will use default 0,0 placement.");
     JUMPWorkbench.getInstance().getFrame()
-        .warnUser(this.getClass().getName() + ".no-geo-reference-found");
+        .warnUser(this.getClass().getName() + ".no-georeference-found");
 
     // set up a default envelope
     double[] tags = new double[6];



_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to