Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9898
Modified Files:
Tag: dcraw-original-branch
dcraw.cc
Log Message:
dcraw original 9.23 (1.469).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.1.2.137
retrieving revision 1.1.2.138
diff -u -d -r1.1.2.137 -r1.1.2.138
--- dcraw.cc 30 Jan 2015 14:30:09 -0000 1.1.2.137
+++ dcraw.cc 11 Feb 2015 05:15:39 -0000 1.1.2.138
@@ -1722,7 +1722,7 @@
if (!ljpeg_start (&jh, 0)) return;
order = 0x4949;
ph1_bits(-1);
- back[4] = calloc (raw_width, 3*sizeof **back);
+ back[4] = (int *) calloc (raw_width, 3*sizeof **back);
merror (back[4], "hasselblad_load_raw()");
FORC3 back[c] = back[4] + c*raw_width;
cblack[6] >>= sh = tiff_samples > 1;
@@ -6694,7 +6694,7 @@
fseek (ifp, size, SEEK_CUR);
}
-void parse_qt (int end)
+void CLASS parse_qt (int end)
{
unsigned save, size;
char tag[4];
@@ -8125,6 +8125,7 @@
{ 12272756,4040,3030, 2, 0, 0,13, 0,0x49,0,0,"Kodak","12MP",31556 },
{ 18000000,4000,3000, 0, 0, 0, 0, 0,0x00,0,0,"Kodak","12MP" },
{ 614400, 640, 480, 0, 3, 0, 0,64,0x94,0,0,"Kodak","KAI-0340" },
+ { 15360000,3200,2400, 0, 0, 0, 0,96,0x16,0,0,"Lenovo","A820" },
{ 3884928,1608,1207, 0, 0, 0, 0,96,0x16,0,0,"Micron","2010",3212 },
{ 1138688,1534, 986, 0, 0, 0, 0, 0,0x61,0,0,"Minolta","RD175",513 },
{ 1581060,1305, 969, 0, 0,18, 6, 6,0x1e,4,1,"Nikon","E900" },
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
