Changeset 556

Timestamp:

11/11/08 10:06:05 (5 years ago)

Author:

phyrephox

Message:

*fixed a bug that prevented curves from showing up in latest builds regardless of OPT_CURVES state... i wonder why only one person noticed it so far :D

Location:

trunk/core

Files:

• gui.c (modified) (8 diffs)
• gui_osd.c (modified) (1 diff)
• main.c (modified) (1 diff)
• raw.c (modified) (3 diffs)

trunk/core/gui.c

@@ -38 +38 @@
 #include "motion_detector.h"
 #include "raw.h"
-#ifdef CURVES
+#ifdef OPT_CURVES
         #include "curves.h"
 #endif
@@ -162 +162 @@
 #endif
 static void gui_menuproc_swap_patitons(int arg);
-#ifdef CURVES
+#ifdef OPT_CURVES
         static void gui_load_curve_selected(const char *fn);
         static void gui_load_curve(int arg);
@@ -229 +229 @@
 static const char* gui_script_param_set_enum(int change, int arg);
 static const char* gui_override_disable_enum(int change, int arg);
-#ifdef CURVES
+#ifdef OPT_CURVES
         static const char* gui_conf_curve_enum(int change, int arg);
 #endif
@@ -768 +768 @@
 static CMenu zebra_submenu = {0x26,LANG_MENU_ZEBRA_TITLE, NULL, zebra_submenu_items };
 
-#ifdef CURVES
+#ifdef OPT_CURVES
 static CMenuItem curve_submenu_items[] = {
     {0x5f,LANG_MENU_CURVE_ENABLE,        MENUITEM_ENUM,      (int*)gui_conf_curve_enum },    
@@ -789 +789 @@
     {0x26,LANG_MENU_MAIN_ZEBRA_PARAM,        MENUITEM_SUBMENU,   (int*)&zebra_submenu },
     {0x27,LANG_MENU_MAIN_SCRIPT_PARAM,       MENUITEM_SUBMENU,   (int*)&script_submenu },
-#ifdef CURVES
+#ifdef OPT_CURVES
     {0x85,LANG_MENU_CURVE_PARAM,             MENUITEM_SUBMENU,   (int*)&curve_submenu },
 #endif
@@ -872 +872 @@
 
 //-------------------------------------------------------------------
-#ifdef CURVES
+#ifdef OPT_CURVES
 const char* gui_conf_curve_enum(int change, int arg) {
     static const char* modes[]={ "None", "Custom", "+1EV", "+2EV", "Auto DR" };
@@ -1856 +1856 @@
     load_bad_pixels_list("A/CHDK/badpixel");
     load_bad_pixels_list("A/CHDK/badpixel.txt");
-#ifdef CURVES
+#ifdef OPT_CURVES
     curve_load(conf.curve_file); // load curve upon init 
     drcurve_load("A/CHDK/SYSCURVES.CVF"); // load system L curves
@@ -1867 +1867 @@
 
 //-------------------------------------------------------------------
-#ifdef CURVES
+#ifdef OPT_CURVES
 static void gui_load_curve_selected(const char *fn) {
     if (fn)

trunk/core/gui_osd.c

@@ -765 +765 @@
         gui_print_osd_state_string_int("SD:",shooting_get_subject_distance_bracket_value());
      }
-#ifdef CURVES
+#ifdef OPT_CURVES
         if (conf.curve_enable || gui_mode==GUI_MODE_OSD) {
         if (conf.curve_enable==1) gui_print_osd_state_string_chr("CURVES:", "CSTM");

trunk/core/main.c

@@ -99 +99 @@
     mkdir("A/CHDK/BOOKS");
     mkdir("A/CHDK/GRIDS");
-#ifdef CURVES
+#ifdef OPT_CURVES
     mkdir("A/CHDK/CURVES");
 #endif

trunk/core/raw.c

@@ -3 +3 @@
 #include "stdlib.h"
 #include "raw.h"
-#ifdef CURVES
+#ifdef OPT_CURVES
         #include "curves.h"
 #endif
@@ -41 +41 @@
       close(fd);
       }
-#ifdef CURVES
+#ifdef OPT_CURVES
      if (conf.curve_enable) curve_apply();
 #endif
@@ -98 +98 @@
     }
 
-#ifdef CURVES
+#ifdef OPT_CURVES
     if (conf.curve_enable) curve_apply();
 #endif