Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17865
Modified Files:
dcraw.cc
Log Message:
Enable badpixel correction for all non-Merrill/non-Quattro Sigma camera models.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- dcraw.cc 21 Feb 2015 04:00:29 -0000 1.327
+++ dcraw.cc 21 Feb 2015 14:30:13 -0000 1.328
@@ -3629,12 +3629,14 @@
free (black);
free (sgrow);
free (sgain);
+#endif
- if ((badpix = (unsigned int *) foveon_camf_matrix (dim, "BadPixels"))) {
- for (i=0; i < dim[0]; i++) {
+ if (foveon_camf_param ("IncludeBlocks", "BadPixels")) {
+ badpix = (unsigned int *) foveon_camf_matrix (dim, "BadPixels");
+ for (i=0; i < (int) dim[0]; i++) {
col = (badpix[i] >> 8 & 0xfff) - keep[0];
row = (badpix[i] >> 20 ) - keep[1];
- if ((unsigned)(row-1) > height-3 || (unsigned)(col-1) > width-3)
+ if (row-1 < 0 || row-1 > height-3 || col-1 < 0 || col-1 > width-3)
continue;
memset (fsum, 0, sizeof fsum);
for (sum=j=0; j < 8; j++)
@@ -3647,7 +3649,6 @@
}
free (badpix);
}
-#endif
/* Array for 5x5 Gaussian averaging of red values */
smrow[6] = (int (*)[3]) calloc (width*5, sizeof **smrow);
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
