Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11108
Modified Files:
Tag: dcraw-original-branch
dcraw.cc
Log Message:
dcraw original 8.98 (1.429).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.1.2.97
retrieving revision 1.1.2.98
diff -u -d -r1.1.2.97 -r1.1.2.98
--- dcraw.cc 31 Aug 2009 16:40:48 -0000 1.1.2.97
+++ dcraw.cc 17 Sep 2009 13:15:20 -0000 1.1.2.98
@@ -23,7 +23,7 @@
$Date$
*/
-#define VERSION "8.97"
+#define VERSION "8.98"
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@@ -5993,6 +5993,8 @@
{ 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } },
{ "Canon EOS 5D", 0, 0xe6c,
{ 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } },
+ { "Canon EOS 7D", 0, 0x3510, /* DJC */
+ { 7956,-1490,-850,-2896,10428,2469,-827,1800,5680 } },
{ "Canon EOS 10D", 0, 0xfa0,
{ 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } },
{ "Canon EOS 20Da", 0, 0,
@@ -6607,6 +6609,7 @@
{ 7753344, "CASIO", "EX-Z55" ,1 },
{ 7816704, "CASIO", "EX-Z60" ,1 },
{ 10843712, "CASIO", "EX-Z75" ,1 },
+ { 12310144, "CASIO", "EX-Z850" ,1 },
{ 7426656, "CASIO", "EX-P505" ,1 },
{ 9313536, "CASIO", "EX-P600" ,1 },
{ 10979200, "CASIO", "EX-P700" ,1 },
@@ -7064,6 +7067,11 @@
if (unique_id == 0x80000252)
adobe_coeff ("Canon","EOS 500D");
goto canon_cr2;
+ } else if (is_canon && raw_width == 1340) {
+ top_margin = 51;
+ left_margin = 158;
+ raw_width = width *= 4;
+ goto canon_cr2;
} else if (is_canon && raw_width == 1448) {
top_margin = 51;
left_margin = 158;
@@ -7880,6 +7888,12 @@
height = 2321;
width = 3089;
raw_width = 4672;
+ maximum = 0xfff;
+ } else if (!strcmp(model,"EX-Z850")) {
+ height = 2468;
+ width = 3279;
+ raw_width = 4928;
+ maximum = 0xfff;
} else if (!strcmp(model,"EX-P505")) {
height = 1928;
width = 2568;
------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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/devconf
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
