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

Modified Files:
        dcraw_api.cc 
Log Message:
Enable the code for pulling greens together after denoising.


Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- dcraw_api.cc        7 Oct 2009 00:28:32 -0000       1.55
+++ dcraw_api.cc        7 Oct 2009 02:22:17 -0000       1.56
@@ -242,6 +242,11 @@
     if (h->colors==3) h->pre_mul[3] = 0;
     memcpy(h->cam_mul, d->cam_mul, sizeof d->cam_mul);
     memcpy(h->rgb_cam, d->rgb_cam, sizeof d->rgb_cam);
+    // set post_mul in case wavelet_denoise() is called and scale_colors()
+    // was never called.
+    memcpy(h->post_mul, h->pre_mul, sizeof h->post_mul);
+    if (h->post_mul[3] == 0)
+       h->post_mul[3] = h->colors < 4 ? h->post_mul[1] : 1;
 
     double rgb_cam_transpose[4][3];
     for (i=0; i<4; i++) for (j=0; j<3; j++)
@@ -513,8 +518,8 @@
 {
     if (threshold)
        wavelet_denoise_INDI(h->raw.image, h->black, h->raw.height,
-               h->raw.width, h->height, h->width, h->raw.colors, h->shrink,
-               h->pre_mul, threshold, h->fourColorFilters);
+               h->raw.width, h->height, h->width, h->colors, h->shrink,
+               h->post_mul, threshold, h->fourColorFilters);
 }
 
 void dcraw_wavelet_denoise_shrinked(dcraw_image_data *f, float threshold)


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to