Changeset 13220 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

Timestamp:

2017-12-18T00:46:58+01:00 (8 years ago)

Author:

Don-vip

Message:

see #15574:

• additionally refactors ImageDisplay to use ImageEntry instead; stores width and height info while metadata of images are read; might break plugin code (patch by cmuelle8, minor changes)
• remove double semicolon causing ​https://github.com/pmd/pmd/issues/785
• enable PMD rule DoNotCallGarbageCollectionExplicitly
• disable SpotBugs rule ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -21 +21 @@
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.exif.GpsDirectory;
+import com.drew.metadata.jpeg.JpegDirectory;
 
 /**
@@ -53 +54 @@
     private Date gpsTime;
 
+    private int width;
+    private int height;
+
     /**
      * When the correlation dialog is open, we like to show the image position
@@ -77 +81 @@
 
     /**
+     * Returns width of the image this ImageEntry represents.
+     * @return width of the image this ImageEntry represents
+     * @since 13220
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * Returns height of the image this ImageEntry represents.
+     * @return height of the image this ImageEntry represents
+     * @since 13220
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
      * Returns the position value. The position value from the temporary copy
      * is returned if that copy exists.
@@ -142 +164 @@
      */
     public Integer getExifOrientation() {
-        return exifOrientation;
+        return exifOrientation != null ? exifOrientation : 1;
     }
 
@@ -228 +250 @@
             new ThumbsLoader(Collections.singleton(this)).run();
         }
+    }
+
+    /**
+     * Sets the width of this ImageEntry.
+     * @param width set the width of this ImageEntry
+     * @since 13220
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /**
+     * Sets the height of this ImageEntry.
+     * @param height set the height of this ImageEntry
+     * @since 13220
+     */
+    public void setHeight(int height) {
+        this.height = height;
     }
 
@@ -457 +497 @@
         }
 
+        final Directory dir = metadata.getFirstDirectoryOfType(JpegDirectory.class);
         final Directory dirExif = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
         final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
@@ -464 +505 @@
                 int orientation = dirExif.getInt(ExifIFD0Directory.TAG_ORIENTATION);
                 setExifOrientation(orientation);
+            }
+        } catch (MetadataException ex) {
+            Logging.debug(ex);
+        }
+
+        try {
+            if (dir != null) {
+                // there are cases where these do not match width and height stored in dirExif
+                int width = dir.getInt(JpegDirectory.TAG_IMAGE_WIDTH);
+                int height = dir.getInt(JpegDirectory.TAG_IMAGE_HEIGHT);
+                setWidth(width);
+                setHeight(height);
             }
         } catch (MetadataException ex) {