Changeset 4241 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2011-07-14T17:00:22+02:00 (13 years ago)

Author:

bastiK

Message:

applied #5605 - Geotagged image viewer should rotate images according to EXIF orientation tag (patch by m.zdila, some modifications)

File:

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

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

@@ -33 +33 @@
 import java.util.Comparator;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
@@ -348 +346 @@
                 public void valueChanged(ListSelectionEvent arg0) {
                     int index = imgList.getSelectedIndex();
-                    imgDisp.setImage(yLayer.data.get(index).getFile());
+                    Integer orientation = null;
+                    try {
+                        orientation = ExifReader.readOrientation(yLayer.data.get(index).getFile());
+                    } catch (Exception e) {
+                    }
+                    imgDisp.setImage(yLayer.data.get(index).getFile(), orientation);
                     Date date = yLayer.data.get(index).getExifTime();
                     if (date != null) {
@@ -380 +383 @@
                         return;
 
-                    imgDisp.setImage(sel);
+                    Integer orientation = null;
+                    try {
+                        orientation = ExifReader.readOrientation(sel);
+                    } catch (Exception e) {
+                    }
+                    imgDisp.setImage(sel, orientation);
 
                     Date date = null;