Changeset 1416

Timestamp:

11/14/11 07:50:17 (19 months ago)

Author:

philmoz

Message:

Disable RAW on SX40HS in 'HQ Burst' and 'Handheld Night Scene' modes. Causes corruption of JPEG and/or RAW/DNG files.

Location:

trunk

Files:

• core/conf.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• platform/sx40hs/platform_camera.h (modified) (1 diff)

trunk/core/conf.c

@@ -811 +811 @@
         (shooting_get_prop(PROPCASE_RESOLUTION)==7) ||                                      // True if shooting resolution is 'low light'
 #endif
+#if defined(CAM_DISABLE_RAW_IN_HQ_BURST)
+        (m == MODE_SCN_HIGHSPEED_BURST) ||                                                  // True if HQ Burst mode (SX40HS corrupts JPEG images if RAW enabled in this mode)
+#endif
+#if defined(CAM_DISABLE_RAW_IN_HANDHELD_NIGHT_SCN)
+        (m == MODE_NIGHT_SCENE) ||                                                          // True if HandHeld Night Scene (SX40HS corrupts JPEG images if RAW enabled in this mode)
+#endif
         (shooting_get_prop(PROPCASE_RESOLUTION)==5) ||                                      // True if shooting resolution is ??? (what is mode 5)
         ((m==MODE_SPORTS) && conf.save_raw_in_sports) ||                                    // True if sports mode and save_raw_in_sports is disabled

trunk/include/camera.h

@@ -175 +175 @@
 #undef CAM_AV_OVERRIDE_IRIS_FIX                  // for cameras that require _MoveIrisWithAv function to override Av (for bracketing).
 
-#undef CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE         // For cameras with 'low light' mode that does now work with raw define this
+#undef CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE         // For cameras with 'low light' mode that does not work with raw define this
+#undef CAM_DISABLE_RAW_IN_HQ_BURST               // For cameras with 'HQ Burst' mode that does not work with raw define this
+#undef CAM_DISABLE_RAW_IN_HANDHELD_NIGHT_SCN     // For cameras with 'HandHeld Night Scene' mode that does not work with raw define this
 
 #undef CAM_LOAD_CUSTOM_COLORS                   // Define to enable loading CHDK custom colors into the camera color palette

trunk/platform/sx40hs/platform_camera.h

@@ -112 +112 @@
         #define CAM_AV_OVERRIDE_IRIS_FIX        1                               // for cameras that require _MoveIrisWithAv function to override Av in bracketing.
 
-    #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE   1       // For cameras with 'low light' mode that does now work with raw define this
+    #define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE   1       // For cameras with 'low light' mode that does not work with raw define this
+    #define CAM_DISABLE_RAW_IN_HQ_BURST         1       // For cameras with 'HQ Burst' mode that does not work with raw define this
+    #define CAM_DISABLE_RAW_IN_HANDHELD_NIGHT_SCN 1     // For cameras with 'HandHeld Night Scene' mode that does not work with raw define this
 
     #define CAM_LOAD_CUSTOM_COLORS              1       // Enable loading CHDK colors into the camera palette memory/hardware