Changeset 1040 for trunk

Timestamp:

01/10/11 02:27:32 (2 years ago)

Author:

reyalP

Message:

formatting cleanup in raw.c

File:

• trunk/core/raw.c (modified) (10 diffs)

trunk/core/raw.c

@@ -5 +5 @@
 #include "console.h"
 #if DNG_SUPPORT
-        #include "dng.h"
-        #include "math.h"
-        #include "keyboard.h"
+    #include "dng.h"
+    #include "math.h"
+    #include "keyboard.h"
     #include "action_stack.h"
     #include "gui_draw.h"
@@ -14 +14 @@
 #endif
 #ifdef OPT_CURVES
-        #include "curves.h"
+    #include "curves.h"
 #endif
 #include "shot_histogram.h"
@@ -51 +51 @@
 }
 
-char* get_alt_raw_image_addr(void){     // return inactive buffer for cameras with multiple RAW buffers (otherwise return active buffer)
+char* get_alt_raw_image_addr(void){    // return inactive buffer for cameras with multiple RAW buffers (otherwise return active buffer)
  if (!conf.raw_cache) return hook_alt_raw_image_addr();
  else return (char*) ((int)hook_alt_raw_image_addr()&~CAM_UNCACHED_BIT);
@@ -126 +126 @@
     if (state_kbd_script_run && shot_histogram_isenabled()) build_shot_histogram();
 
-        // Get pointers to RAW buffers (will be the same on cameras that don't have two or more buffers)
-        char* rawadr = get_raw_image_addr();
-        char* altrawadr = get_alt_raw_image_addr();
+    // Get pointers to RAW buffers (will be the same on cameras that don't have two or more buffers)
+    char* rawadr = get_raw_image_addr();
+    char* altrawadr = get_alt_raw_image_addr();
 
     // ! ! ! exclusively for badpixel creation ! ! !
@@ -174 +174 @@
     state_shooting_progress = SHOOTING_PROGRESS_PROCESSING;
 
-        if (conf.save_raw && (!(shooting_get_prop(PROPCASE_RESOLUTION)==5)) && (!((movie_status > 1) && conf.save_raw_in_video   )) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((m==MODE_AUTO) && conf.save_raw_in_auto)) && (!(conf.edge_overlay_enable && conf.save_raw_in_edgeoverlay)) && (!((shooting_get_drive_mode()==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS))) && (!((shooting_get_drive_mode()>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) ) {
+    if (conf.save_raw
+        && (!(shooting_get_prop(PROPCASE_RESOLUTION)==5))
+        && (!((movie_status > 1) && conf.save_raw_in_video)) 
+        && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) 
+        && (!((m==MODE_AUTO) && conf.save_raw_in_auto)) 
+        && (!(conf.edge_overlay_enable && conf.save_raw_in_edgeoverlay))
+        && (!((shooting_get_drive_mode()==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS))) 
+        && (!((shooting_get_drive_mode()>=2) && conf.save_raw_in_timer))
+        && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) )
+    {
         long v;
-int timer; char txt[30];
+        int timer; char txt[30];
 
         started();
@@ -184 +193 @@
         mkdir("A/DCIM");
 #if defined(CAM_DATE_FOLDER_NAMING)
-                if (conf.raw_in_dir)
-                        get_target_dir_name(dir);
-                else
-                        sprintf(dir, RAW_TARGET_DIRECTORY, 100);
+        if (conf.raw_in_dir)
+            get_target_dir_name(dir);
+        else
+            sprintf(dir, RAW_TARGET_DIRECTORY, 100);
 #else
         sprintf(dir, RAW_TARGET_DIRECTORY, (conf.raw_in_dir)?get_target_dir_num():100);
@@ -194 +203 @@
 
         sprintf(fn, "%s/", dir);
-                if(br_counter && conf.bracketing_add_raw_suffix && (shooting_get_drive_mode()!=0))
-            sprintf(fn+strlen(fn), RAW_BRACKETING_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), br_counter,conf.dng_raw&&conf.raw_dng_ext ? ".DNG" : img_exts[conf.raw_ext]);
-        else
-            sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(),
-            conf.dng_raw&&conf.raw_dng_ext ? ".DNG" : img_exts[conf.raw_ext]); 
+        if(br_counter && conf.bracketing_add_raw_suffix && (shooting_get_drive_mode()!=1)) {
+            sprintf(fn+strlen(fn), 
+                    RAW_BRACKETING_FILENAME,
+                    img_prefixes[conf.raw_prefix],
+                    get_target_file_num(),
+                    br_counter,
+                    conf.dng_raw&&conf.raw_dng_ext ? ".DNG" : img_exts[conf.raw_ext]);
+        } else {
+            sprintf(fn+strlen(fn),
+                    RAW_TARGET_FILENAME,
+                    img_prefixes[conf.raw_prefix],
+                    get_target_file_num(),
+                    conf.dng_raw&&conf.raw_dng_ext ? ".DNG" : img_exts[conf.raw_ext]); 
+        }
         fd = open(fn, O_WRONLY|O_CREAT, 0777);
         if (fd>=0) {
@@ -217 +235 @@
 #endif
             if (conf.dng_raw) {
-                                // Write alternate (inactive) buffer that we reversed the bytes into above (if only one buffer then it will be the active buffer instead)
-                        write(fd, (char*)(((unsigned long)altrawadr)|CAM_UNCACHED_BIT), hook_raw_size());
-                        }
-                        else
-                        {
-                                // Write active RAW buffer
-                    write(fd, (char*)(((unsigned long)rawadr)|CAM_UNCACHED_BIT), hook_raw_size());
-                        }
+                // Write alternate (inactive) buffer that we reversed the bytes into above (if only one buffer then it will be the active buffer instead)
+                write(fd, (char*)(((unsigned long)altrawadr)|CAM_UNCACHED_BIT), hook_raw_size());
+            }
+            else
+            {
+                // Write active RAW buffer
+                write(fd, (char*)(((unsigned long)rawadr)|CAM_UNCACHED_BIT), hook_raw_size());
+            }
             close(fd);
             utime(fn, &t);
@@ -230 +248 @@
             if (conf.dng_raw) {
              if (get_dng_header() && thumbnail_buf) {
-                                 if (rawadr == altrawadr)       // If only one RAW buffer then we have to swap the bytes back
-                                        reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
+                 if (rawadr == altrawadr)    // If only one RAW buffer then we have to swap the bytes back
+                    reverse_bytes_order2(rawadr, altrawadr, hook_raw_size());
           //   unpatch_bad_pixels_b();
               }
@@ -396 +414 @@
             if (rcnt > 0) {
                 if (rcnt == PIXELS_BUF_SIZE) 
-                    buf[PIXELS_BUF_SIZE-1] = 0;
+                buf[PIXELS_BUF_SIZE-1] = 0;
                 else
-                    buf[rcnt] = 0;
+                buf[rcnt] = 0;
             }
             close(fd);