[UFRaw-CVS] ufraw ufraw_preview.c, 1.270, 1.271 ufraw_ufraw.c, 1.183, 1.184

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

Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26548

Modified Files:
	ufraw_preview.c ufraw_ufraw.c 
Log Message:
Clean up use of Developer macro.

Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- ufraw_ufraw.c	22 Sep 2009 16:30:08 -0000	1.183
+++ ufraw_ufraw.c	23 Sep 2009 13:15:15 -0000	1.184
@@ -1385,7 +1385,7 @@
     double rgbWB[3];
     int status, c, cc, i;
 
-    UFRawPhase phase = uf->developer!=NULL && uf->developer->doWB ?
+    UFRawPhase phase = uf->developer->doWB ?
 	    ufraw_develop_phase : ufraw_first_phase;
     for (; phase < ufraw_phases_num; phase++)
 	uf->Images[phase].valid = 0;

Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- ufraw_preview.c	23 Sep 2009 05:45:18 -0000	1.270
+++ ufraw_preview.c	23 Sep 2009 13:15:13 -0000	1.271
@@ -939,7 +939,7 @@
     /* Prepare pen color, which is not effected by exposure.
      * Use a small value to avoid highlights and then normalize. */
     /* we use the developer for our own purpose so enable WB */
-    data->UF->developer->doWB++;
+    Developer->doWB++;
     for (c=0; c<colors; c++) {
 	for (cl=0; cl<colors; cl++) p16[cl] = 0;
 	p16[c] = Developer->max * 0x08000 / Developer->rgbWB[c] *
@@ -971,7 +971,7 @@
 		    (hisHeight-1) / MAXOUT;
 	}
     }
-    data->UF->developer->doWB--;
+    Developer->doWB--;
     for (x=0; x<raw_his_size; x++) {
 	/* draw the raw histogram */
 	for (c=0, y0=0; c<colors; c++) {
@@ -2578,7 +2578,7 @@
 	CFG->green = data->initialGreen;
 	for (c=0; c<4; c++) CFG->chanMul[c] = data->initialChanMul[c];
 
-	UFRawPhase phase = Developer!=NULL && Developer->doWB ?
+	UFRawPhase phase = Developer->doWB ?
 		ufraw_develop_phase : ufraw_first_phase;
 	for (; phase < ufraw_phases_num; phase++)
 	    data->UF->Images[phase].valid = 0;