Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv5570
Modified Files:
Tag: dcraw-original-branch
dcraw.cc
Log Message:
dcraw original 9.15 (1.448).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.1.2.118
retrieving revision 1.1.2.119
diff -u -d -r1.1.2.118 -r1.1.2.119
--- dcraw.cc 27 Dec 2011 03:20:27 -0000 1.1.2.118
+++ dcraw.cc 19 Jun 2012 03:11:18 -0000 1.1.2.119
@@ -1,6 +1,6 @@
/*
dcraw.c -- Dave Coffin's raw photo decoder
- Copyright 1997-2011 by Dave Coffin, dcoffin a cybercom o net
+ Copyright 1997-2012 by Dave Coffin, dcoffin a cybercom o net
This is a command-line ANSI C program to convert raw photos from
any digital camera on any computer running any operating system.
@@ -23,7 +23,7 @@
$Date$
*/
[...2460 lines suppressed...]
colorcheck();
#endif
- if (is_foveon && !document_mode) foveon_interpolate();
- if (!is_foveon && document_mode < 2) scale_colors();
+ if (is_foveon) {
+ if (document_mode || model[0] == 'D') {
+ for (i=0; i < height*width*4; i++)
+ if ((short) image[0][i] < 0) image[0][i] = 0;
+ } else foveon_interpolate();
+ } else if (document_mode < 2)
+ scale_colors();
pre_interpolate();
if (filters && !document_mode) {
if (quality == 0)
lin_interpolate();
- else if (quality == 1 || colors > 3)
+ else if (quality == 1 || colors > 3 || filters < 1000)
vng_interpolate();
else if (quality == 2)
ppg_interpolate();
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
