Changeset 8765 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-09-18T00:59:57+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11867 - ThumbsLoader freezes if EXIF orientation is not set (patch by holgermappt)

File:

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

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

@@ -100 +100 @@
         final int h = img.getHeight(null);
         final int hh, ww;
-        if (ExifReader.orientationSwitchesDimensions(entry.getExifOrientation())) {
+        final Integer exifOrientation = entry.getExifOrientation();
+        if (exifOrientation != null && ExifReader.orientationSwitchesDimensions(exifOrientation)) {
             ww = h;
             hh = w;
@@ -114 +115 @@
         Graphics2D g = scaledBI.createGraphics();
 
-        final AffineTransform restoreOrientation = ExifReader.getRestoreOrientationTransform(entry.getExifOrientation(), w, h);
         final AffineTransform scale = AffineTransform.getScaleInstance((double) targetSize.width / ww, (double) targetSize.height / hh);
-        scale.concatenate(restoreOrientation);
+        if (exifOrientation != null) {
+            final AffineTransform restoreOrientation = ExifReader.getRestoreOrientationTransform(exifOrientation, w, h);
+            scale.concatenate(restoreOrientation);
+        }
 
         while (!g.drawImage(img, scale, null)) {