Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21900
Modified Files:
dcraw_api.cc
Log Message:
Fix the color of Canon sRAW images (which don't have filters).
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- dcraw_api.cc 28 Nov 2009 05:56:51 -0000 1.62
+++ dcraw_api.cc 4 Dec 2009 06:46:01 -0000 1.63
@@ -619,7 +619,14 @@
f4 = h->fourColorFilters;
if (h->colors == 3)
rgbWB[3] = rgbWB[1];
- if (dark) {
+ if (f4 == 0) {
+ for(r=0; r<h->height; r++)
+ for(c=0; c<h->width; c++)
+ for (cc=0; cc<4; cc++)
+ h->raw.image[r * h->raw.width + c][cc] = MIN( MAX( (gint64)
+ (get_pixel(h, dark, r, c, cc, pixels) - black) *
+ rgbWB[cc]/0x10000, 0), 0xFFFF);
+ } else if (dark) {
for(r=0; r<h->height; r++)
for(c=0; c<h->width; c++) {
int cc = fc_INDI(f4,r,c);
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
