Fix exif rotation angle

	modified:   src/modules/gtk2/producer_pixbuf.c
	modified:   src/modules/qimage/qimage_wrapper.cpp

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 68c8fed72b55fd0cd95948f0fb9ca70d89e10170..a3c106ee3550528c36c34e0c2cda16db420a6a6c 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -297,7 +297,7 @@ static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int
                                    processed = gdk_pixbuf_flip ( pixbuf, FALSE );
                                    break;
                                case 8:
-                                   matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
+                                   matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
                                    processed = pixbuf;
                                    break;
                                case 3:
@@ -305,15 +305,15 @@ static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int
                                    processed = pixbuf;
                                    break;
                                case 6:
-                                   matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
+                                   matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
                                    processed = pixbuf;
                                    break;
                                case 5:
-                                   matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
+                                   matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
                                    processed = gdk_pixbuf_flip ( pixbuf, TRUE );
                                    break;
                                case 7:
-                                   matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
+                                   matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
                                    processed = gdk_pixbuf_flip ( pixbuf, TRUE );
                                    break;
 

diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index c07a32c24ee78948dc98ae3d7026fc426ade7d6b..ef113af694367514735a9e4aac0f4a9ede8289fc 100644 (file)
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -185,18 +185,18 @@ void refresh_qimage( producer_qimage self, mlt_frame frame, int width, int heigh
                                    matrix.scale( 1, -1 );
                                    break;
                                case 5:
-                                   matrix.rotate( 90 );
+                                   matrix.rotate( 270 );
                                    matrix.scale( -1, 1 );
                                    break;
                                case 6:
-                                   matrix.rotate( 270 );
+                                   matrix.rotate( 90 );
                                    break;
                                case 7:
-                                   matrix.rotate( 270 );
+                                   matrix.rotate( 90 );
                                    matrix.scale( -1, 1 );
                                    break;
                                case 8:
-                                   matrix.rotate( 90 );
+                                   matrix.rotate( 270 );
                                    break;
                              }
                              processed = qimage->transformed( matrix );