[vlc-commits] include: fix EXIF conversion macros

Rémi Denis-Courmont git at videolan.org
Sun Apr 17 22:45:40 CEST 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 17 23:45:02 2016 +0300| [771a5cad156d9c400d1ac741360b712007d2d367] | committer: Rémi Denis-Courmont

include: fix EXIF conversion macros

Values were inverted nibble-wise.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=771a5cad156d9c400d1ac741360b712007d2d367
---

 include/vlc_es.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 566f31e..9c0feb9 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -166,9 +166,9 @@ typedef enum video_orientation_t
     ORIENT_ROTATED_90  = ORIENT_RIGHT_TOP,
 } video_orientation_t;
 /** Convert EXIF orientation to enum video_orientation_t */
-#define ORIENT_FROM_EXIF(exif) ((0x01324675U >> (4 * ((exif) - 1))) & 7)
+#define ORIENT_FROM_EXIF(exif) ((0x57642310U >> (4 * ((exif) - 1))) & 7)
 /** Convert enum video_orientation_t to EXIF */
-#define ORIENT_TO_EXIF(orient) ((0x12435867U >> (4 * (orient))) & 15)
+#define ORIENT_TO_EXIF(orient) ((0x76853421U >> (4 * (orient))) & 15)
 /** If the orientation is natural or mirrored */
 #define ORIENT_IS_MIRROR(orient) parity(orient)
 /** If the orientation swaps dimensions */



More information about the vlc-commits mailing list