Changeset 9697 in josm for trunk/src/org

Timestamp:

2016-01-31T14:38:51+01:00 (9 years ago)

Author:

simon04

Message:

Fix MetadataException: "Tag 'Orientation' has not been set -- check using containsTag() first"

File:

• trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -104 +104 @@
             final Metadata metadata = JpegMetadataReader.readMetadata(filename);
             final Directory dir = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
-            return dir.getInt(ExifIFD0Directory.TAG_ORIENTATION);
-        } catch (JpegProcessingException | MetadataException | IOException e) {
+            return dir == null ? null : dir.getInteger(ExifIFD0Directory.TAG_ORIENTATION);
+        } catch (JpegProcessingException | IOException e) {
             Main.error(e);
         }
@@ -122 +122 @@
             final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
             return readLatLon(dirGps);
-        } catch (JpegProcessingException e) {
-            Main.error(e);
-        } catch (IOException e) {
-            Main.error(e);
-        } catch (MetadataException e) {
+        } catch (JpegProcessingException | IOException | MetadataException e) {
             Main.error(e);
         }
@@ -160 +156 @@
             final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class);
             return readDirection(dirGps);
-        } catch (JpegProcessingException e) {
-            Main.error(e);
-        } catch (IOException e) {
+        } catch (JpegProcessingException | IOException e) {
             Main.error(e);
         }