Ticket #8489: mythgallery-orientation.diff

mythgallery/mythgallery/galleryutil.cpp

@@ -141 +141 @@
             {
                     ExifEntry *entry = exif_content_get_entry (data->ifd[i],
                                                         EXIF_TAG_ORIENTATION);
+                    ExifByteOrder o = exif_data_get_byte_order (data);
+
                     if (entry)
                     {
-#if NEW_LIB_EXIF
-                        exif_entry_get_value(entry, exifvalue, 1023);
-                        QString value = exifvalue;
-#else
-                        QString value = exif_entry_get_value(entry);
-#endif
-                        if (value == "left - bottom")
+                        ExifShort v_short = exif_get_short (entry->data, o);
+                        VERBOSE(VB_GENERAL, QString("Exif entry=%1").arg(v_short));
+                        /* From http://sylvana.net/jpegcrop/exif_orientation.html
+Read this table as follows
+Entry #6 in the table says that the 0th row in the stored image is the right side of the captured scene, and the 0th column in the stored image is the top side of the captured scene.
+Example left bottom means (L stands for Left side of real picture and B for bottom):
+Stored picture
+LLLLLLLLLL
+B        |
+B        |
+B        |
+B--------+
+That is the real picture is
+L-----+
+L     |
+L     |
+L     |
+L     |
+L     |
+LBBBBBB
+
+So this means a rotate angle of -90 degrees from the natural orientation
+and so on...
+                           Value  0th Row       0th Column
+                           1      top           left side
+                           2      top           right side
+                           3      bottom        right side
+                           4      bottom        left side
+                           5      left side     top
+                           6      right side    top
+                           7      right side    bottom
+                           8      left side     bottom
+                        */
+                        /* We are only interested in "normal" mis-orientation
+                           that is you took the picture handing your camera
+                           rotated to take portrait */
+                        if (v_short == 8)
                         {
                           rotateAngle = -90;
                         }
-                        else if (value == "right - top")
+                        else if (v_short == 6)
                         {
                           rotateAngle = 90;
                         }