[UFRaw-CVS] ufraw dcraw.cc,1.80,1.81 dcraw.h,1.23,1.24

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14729

Modified Files:
	dcraw.cc dcraw.h 
Log Message:
Clean up global variables.

Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- dcraw.cc	15 Jun 2007 03:34:18 -0000	1.80
+++ dcraw.cc	21 Jun 2007 04:24:19 -0000	1.81
@@ -92,8 +92,6 @@
 /* All definitions of global variables are defined inside a class in dcraw.h */
 #include "dcraw.h"
 
-double aber[4]={1,1,1,1};
-unsigned greybox[4] = { 0, 0, UINT_MAX, UINT_MAX };
 #ifdef DCRAW_NOMAIN
 extern
 #endif
@@ -117,12 +115,12 @@
 
 CLASS DCRaw()
 {
-bright=1, threshold=0;
-half_size=0, four_color_rgb=0, document_mode=0, highlight=0;
+aber[0] = aber[1] = aber[2] = aber[3] = 1;
+bright=1, user_mul[0] = user_mul[1] = user_mul[2] = user_mul[3] = 0;
+threshold=0, half_size=0, four_color_rgb=0, document_mode=0, highlight=0;
 verbose=0, use_auto_wb=0, use_camera_wb=0, use_camera_matrix=-1;
-output_color=1, output_bps=8, output_tiff=0;
-shot_select=0;
-user_mul[0] = user_mul[1] = user_mul[2] = user_mul[3] = 0;
+output_color=1, output_bps=8, output_tiff=0, shot_select=0;
+greybox[0] = greybox[1] = 0, greybox[2] = greybox[3] = UINT_MAX;
 tone_curve_size = 0, tone_curve_offset = 0; /* Nikon Tone Curves UF*/
 messageBuffer = NULL;
 lastStatus = DCRAW_SUCCESS;

Index: dcraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dcraw.h	13 Jun 2007 14:03:51 -0000	1.23
+++ dcraw.h	21 Jun 2007 04:24:19 -0000	1.24
@@ -38,13 +38,14 @@
 ushort raw_height, raw_width, height, width, top_margin, left_margin;
 ushort shrink, iheight, iwidth, fuji_width, thumb_width, thumb_height;
 int flip, tiff_flip, colors;
-double pixel_aspect;
+double pixel_aspect, aber[4];
 ushort (*image)[4], white[8][8], curve[0x1000], cr2_slice[3];
 float bright, user_mul[4], threshold;
 int half_size, four_color_rgb, document_mode, highlight;
 int verbose, use_auto_wb, use_camera_wb, use_camera_matrix;
 int output_color, output_bps, output_tiff;
 int fuji_layout, fuji_secondary, shot_select;
+unsigned greybox[4];
 float cam_mul[4], pre_mul[4], cmatrix[3][4], rgb_cam[3][4];
 int histogram[4][0x2000];
 void (DCRaw::*write_thumb)(FILE *), (DCRaw::*write_fun)(FILE *);