Ticket #12424: 0014-Gallery-Use-common-orientation.patch

mythtv/libs/libmythmetadata/imagemetadata.cpp

@@ -1 +1 @@
 #include "imagemetadata.h"
 
-#include <QImage>
-
 #include "mythlogging.h"
 #include "mythcorecontext.h"  // for avcodeclock
 #include "mythdirs.h"         // for ffprobe
@@ -41 +39 @@
 }
 
 
-QImage Orientation::ApplyExifOrientation(QImage &image, int orientation)
-{
-    QTransform transform;
-
-    switch (orientation)
-    {
-    case 1: // normal
-        return image;
-    case 2: // mirror horizontal
-        return image.mirrored(true, false);
-    case 3: // rotate 180
-        transform.rotate(180);
-        return image.transformed(transform);
-    case 4: // mirror vertical
-        return image.mirrored(false, true);
-    case 5: // mirror horizontal and rotate 270 CCW
-        transform.rotate(270);
-        return image.mirrored(true, false).transformed(transform);
-    case 6: // rotate 90 CW
-        transform.rotate(90);
-        return image.transformed(transform);
-    case 7: // mirror horizontal and rotate 90 CW
-        transform.rotate(90);
-        return image.mirrored(true, false).transformed(transform);
-    case 8: // rotate 270 CW
-        transform.rotate(270);
-        return image.transformed(transform);
-    }
-    return image;
-}
-
-
 /*!
  * \brief Adjust current orientation code to apply a transform to an image
  * \details When displayed the image will be orientated iaw its orientation

mythtv/libs/libmythmetadata/imagemetadata.h

@@ -68 +68 @@
     QString Description();
 
     static int FromRotation(const QString &degrees);
-    static QImage ApplyExifOrientation(QImage &image, int orientation);
 
 private:
     static QString AsText(int orientation);

mythtv/libs/libmythmetadata/imagethumbs.cpp

@@ -309 +309 @@
 
     // Orientate now to optimise load/display time - no orientation
     // is required when displaying thumbnails
-    image = Orientation::ApplyExifOrientation(image, orientBy);
+    image = MythImage::ApplyExifOrientation(image, orientBy);
 
     // Create the thumbnail
     if (!image.save(im->m_thumbPath))

mythtv/libs/libmythui/mythimage.cpp

@@ -114 +114 @@
     Assign(pix.toImage());
 }
 
+QImage MythImage::ApplyExifOrientation(QImage &image, int orientation)
+{
+    QTransform transform;
+
+    switch (orientation)
+    {
+    case 1: // normal
+        return image;
+    case 2: // mirror horizontal
+        return image.mirrored(true, false);
+    case 3: // rotate 180
+        transform.rotate(180);
+        return image.transformed(transform);
+    case 4: // mirror vertical
+        return image.mirrored(false, true);
+    case 5: // mirror horizontal and rotate 270 CCW
+        transform.rotate(270);
+        return image.mirrored(true, false).transformed(transform);
+    case 6: // rotate 90 CW
+        transform.rotate(90);
+        return image.transformed(transform);
+    case 7: // mirror horizontal and rotate 90 CW
+        transform.rotate(90);
+        return image.mirrored(true, false).transformed(transform);
+    case 8: // rotate 270 CW
+        transform.rotate(270);
+        return image.transformed(transform);
+    }
+    return image;
+}
+
 /**
  * Changes the orientation angle of the image according to
  * the exif rotation values. The image will be rotated accordingly.
@@ -122 +153 @@
  */
 void MythImage::Orientation(int orientation)
 {
-    if (m_isOriented)
-        return;
-
-    QMatrix matrix;
-    switch (orientation)
+    if (!m_isOriented)
     {
-    case 1: // If the image is in its original state
-        break;
-
-    case 2: // The image is horizontally flipped
-        Assign(mirrored(true, false));
-        break;
-
-    case 3: // The image is rotated 180°
-        matrix.rotate(180);
-        Assign(transformed(matrix, Qt::SmoothTransformation));
-        break;
-
-    case 4: // The image is vertically flipped
-        Assign(mirrored(false, true));
-        break;
-
-    case 5: // The image is transposed (flipped horizontally, then rotated 90° CCW)
-        matrix.rotate(90);
-        Assign(transformed(matrix, Qt::SmoothTransformation));
-        Assign(mirrored(true, false));
-        break;
-
-    case 6: // The image is rotated 90° CCW
-        matrix.rotate(90);
-        Assign(transformed(matrix, Qt::SmoothTransformation));
-        break;
-
-    case 7: // The image is transversed (flipped horizontally, then rotated 90° CW)
-        matrix.rotate(270);
-        Assign(transformed(matrix, Qt::SmoothTransformation));
-        Assign(mirrored(true, false));
-        break;
-
-    case 8: // The image is rotated 90° CW
-        matrix.rotate(270);
-        Assign(transformed(matrix, Qt::SmoothTransformation));
-        break;
-
-    default:
-        break;
+        Assign(ApplyExifOrientation(*this, orientation));
+        m_isOriented = true;
     }
-
-    m_isOriented = true;
 }
 
 void MythImage::Resize(const QSize &newSize, bool preserveAspect)

mythtv/libs/libmythui/mythimage.h

@@ -31 +31 @@
 class MUI_PUBLIC MythImage : public QImage, public ReferenceCounter
 {
   public:
+    static QImage ApplyExifOrientation(QImage &image, int orientation);
+
     /// Creates a reference counted image, call DecrRef() to delete.
     MythImage(MythPainter *parent, const char *name = "MythImage");
 

mythtv/libs/libmythui/mythuiimage.cpp

@@ -813 +813 @@
     Clear();
     m_Delay = -1;
 
-    if (m_imageProperties.isOriented && !img->IsOriented() &&
-        (m_imageProperties.orientation >= 1 &&
-         m_imageProperties.orientation <= 8))
+    if (m_imageProperties.isOriented && !img->IsOriented())
         img->Orientation(m_imageProperties.orientation);
 
     if (m_imageProperties.forceSize.isNull())
@@ -881 +879 @@
         if (m_imageProperties.isGreyscale && !im->isGrayscale())
             im->ToGreyscale();
 
-        if (m_imageProperties.isOriented && !im->IsOriented() &&
-            (m_imageProperties.orientation >= 1 &&
-             m_imageProperties.orientation <= 8))
+        if (m_imageProperties.isOriented && !im->IsOriented())
             im->Orientation(m_imageProperties.orientation);
 
         m_ImagesLock.lock();