Changeset 18315 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2021-11-07T15:01:40+01:00 (3 years ago)

Author:

Don-vip

Message:

see #21486 - don't try to read int/long/float/double missing GPX metadata

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java

@@ -732 +732 @@
 
         try {
-            if (dirExif != null) {
+            if (dirExif != null && dirExif.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) {
                 setExifOrientation(dirExif.getInt(ExifIFD0Directory.TAG_ORIENTATION));
             }
@@ -740 +740 @@
 
         try {
-            if (dir != null) {
+            if (dir != null && dir.containsTag(JpegDirectory.TAG_IMAGE_WIDTH) && dir.containsTag(JpegDirectory.TAG_IMAGE_HEIGHT)) {
                 // there are cases where these do not match width and height stored in dirExif
                 setWidth(dir.getInt(JpegDirectory.TAG_IMAGE_WIDTH));