Changeset 1117 for trunk

Timestamp:

03/29/11 11:14:17 (2 years ago)

Author:

msl

Message:

• Fix Exif orientation data for SX20
• Author f_m_b
• ​http://chdk.kernreaktor.org/mantis/view.php?id=358
• ​http://forum.chdk-treff.de/viewtopic.php?p=21562#p21562

+ added 180 degrees orintation in dng.c (perhaps for future cameras)

Location:

trunk

Files:

• core/dng.c (modified) (1 diff)
• platform/sx20/kbd.c (modified) (2 diffs)

trunk/core/dng.c

@@ -336 +336 @@
 unsigned short get_orientation_for_exif(short orientation){
  switch(orientation){
-  case 90:  return 6;
-  case 270: return 8;
-  default: return 1;
+  case  90: return 6;  // Right  - Top
+  case 180: return 3;  // Bottom - Right
+  case 270: return 8;  // Left   - Bottom
+  case   0:            // Top    - Left
+  default : return 1;
  }
 }

trunk/platform/sx20/kbd.c

@@ -71 +71 @@
          */
 
-        { 0, KEY_SHOOT_FULL     , 0x00000003 },
-        { 0, KEY_SHOOT_HALF     , 0x00000001 },
-
-        { 1, KEY_UP             , 0x00000400 },
-        { 1, KEY_DOWN           , 0x00000800 },
-        { 1, KEY_LEFT           , 0x00002000 },
-        { 1, KEY_RIGHT          , 0x00001000 },
-        { 1, KEY_SET            , 0x00000100 },
-        { 1, KEY_ZOOM_IN        , 0x00008000 },
-        { 1, KEY_ZOOM_OUT       , 0x00040000 },
-        { 1, KEY_MENU           , 0x00004000 },
-        { 1, KEY_DISPLAY        , 0x00000200 },
-        { 1, KEY_PRINT          , 0x00800000 },
-        { 1, KEY_ERASE          , 0x00000080 },
+        { 0, KEY_SHOOT_FULL     , 0x00000003 },
+        { 0, KEY_SHOOT_HALF     , 0x00000001 },
+
+        { 1, KEY_UP             , 0x00000400 },
+        { 1, KEY_DOWN           , 0x00000800 },
+        { 1, KEY_LEFT           , 0x00002000 },
+        { 1, KEY_RIGHT          , 0x00001000 },
+        { 1, KEY_SET            , 0x00000100 },
+        { 1, KEY_ZOOM_IN        , 0x00008000 },
+        { 1, KEY_ZOOM_OUT       , 0x00040000 },
+        { 1, KEY_MENU           , 0x00004000 },
+        { 1, KEY_DISPLAY        , 0x00000200 },
+        { 1, KEY_PRINT          , 0x00800000 },
+        { 1, KEY_ERASE          , 0x00000080 },
         { 1, KEY_EXPO_CORR      , 0x00000040 },
         { 1, KEY_FLASH          , 0x00100000 },
@@ -297 +297 @@
           physw_status[1] = kbd_new_state[1];
           physw_status[2] = kbd_new_state[2];
-          physw_status[2] |= alt_mode_key_mask;
+          physw_status[1] |= alt_mode_key_mask;
           jogdial_stopped=0;