Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv1670
Modified Files:
dcraw_indi.c dcraw_api.cc
Log Message:
Consistency update for scale_colors_INDI().
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- dcraw_api.cc 11 Jul 2011 04:14:18 -0000 1.77
+++ dcraw_api.cc 6 Sep 2011 03:45:41 -0000 1.78
@@ -608,9 +608,9 @@
for (int c = 0; c < 4; c++)
h->post_mul[c] = 1.0;
} else {
- scale_colors_INDI(h->rgbMax - h->black, h->black, useCameraWB,
- h->cam_mul, h->colors, h->post_mul, h->filters,
- d->white, d->ifname_display, d);
+ scale_colors_INDI(h->rgbMax, h->black, useCameraWB, h->cam_mul,
+ h->colors, h->post_mul, h->filters, d->white,
+ d->ifname_display, d);
}
h->message = d->messageBuffer;
return d->lastStatus;
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- dcraw_indi.c 5 Sep 2011 15:30:24 -0000 1.93
+++ dcraw_indi.c 6 Sep 2011 03:45:41 -0000 1.94
@@ -207,13 +207,13 @@
}
}
-void CLASS scale_colors_INDI(int maximum, const int black,
+void CLASS scale_colors_INDI(const int maximum, const int black,
const int use_camera_wb, const float cam_mul[4], const int colors,
float pre_mul[4], const unsigned filters, /*const*/ ushort white[8][8],
const char *ifname_display, void *dcraw)
{
unsigned row, col, c, sum[8];
- int val, dark, sat;
+ int val;
double dmin, dmax;
if (use_camera_wb && cam_mul[0] != -1) {
@@ -238,8 +238,6 @@
_("%s: Cannot use camera white balance.\n"), ifname_display);
}
if (pre_mul[3] == 0) pre_mul[3] = colors < 4 ? pre_mul[1] : 1;
- dark = black;
- sat = maximum;
for (dmin = DBL_MAX, dmax = c = 0; c < 4; c++) {
if (dmin > pre_mul[c])
dmin = pre_mul[c];
@@ -249,7 +247,7 @@
FORC4 pre_mul[c] /= dmax;
dcraw_message(dcraw, DCRAW_VERBOSE,
_("Scaling with darkness %d, saturation %d, and\nmultipliers"),
- dark, sat);
+ black, maximum);
FORC4 dcraw_message(dcraw, DCRAW_VERBOSE, " %f", pre_mul[c]);
dcraw_message(dcraw, DCRAW_VERBOSE, "\n");
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
