[UFRaw-CVS] ufraw dcraw_api.cc,1.68,1.69

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23185

Modified Files:
	dcraw_api.cc 
Log Message:
Fix dcraw's black.


Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- dcraw_api.cc	15 Mar 2010 16:05:11 -0000	1.68
+++ dcraw_api.cc	18 Mar 2010 01:54:35 -0000	1.69
@@ -134,11 +134,11 @@
     // maximun and black might change during load_raw. We need them for the
     // camera-wb. If they'll change we will recalculate the camera-wb.
     h->rgbMax = d->maximum;
-    h->black = d->black;
     i = d->cblack[3];
     FORC3 if ((unsigned)i > d->cblack[c]) i = d->cblack[c];
     FORC4 d->cblack[c] -= i;
-    h->black += i;
+    d->black += i;
+    h->black = d->black;
     h->shrink = d->shrink = (h->filters!=0);
     h->pixel_aspect = d->pixel_aspect;
     /* copied from dcraw's main() */
@@ -240,11 +240,11 @@
     // TODO: Go over the following settings to see if they change during
     // load_raw. If they change, document where. If not, move to dcraw_open().
     h->rgbMax = d->maximum;
-    h->black = d->black;
     i = d->cblack[3];
     FORC3 if ((unsigned)i > d->cblack[c]) i = d->cblack[c];
     FORC4 d->cblack[c] -= i;
-    h->black += i;
+    d->black += i;
+    h->black = d->black;
     d->dcraw_message(DCRAW_VERBOSE,_("Black: %d, Maximum: %d\n"),
 	    d->black, d->maximum);
     dmin = DBL_MAX;