Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv21886
Modified Files:
Tag: dcraw-original-branch
dcraw.cc
Log Message:
dcraw original 9.15 (1.449).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.1.2.119
retrieving revision 1.1.2.120
diff -u -d -r1.1.2.119 -r1.1.2.120
--- dcraw.cc 19 Jun 2012 03:11:18 -0000 1.1.2.119
+++ dcraw.cc 26 Jun 2012 16:05:55 -0000 1.1.2.120
@@ -4625,10 +4625,11 @@
cam_mul[2] = getreal(type);
}
if (tag == 0xd && type == 7 && get2() == 0xaaaa) {
- fread (buf97, 1, sizeof buf97, ifp);
- i = (uchar *) memmem (buf97, sizeof buf97,"\xbb\xbb",2) - buf97 + 10;
- if (i < 70 && buf97[i] < 3)
- flip = "065"[buf97[i]]-'0';
+ for (c=i=2; (ushort) c != 0xbbbb && i < len; i++)
+ c = c << 8 | fgetc(ifp);
+ while ((i+=4) < len-5)
+ if (get4() == 257 && (i=len) && (c = (get4(),fgetc(ifp))) < 3)
+ flip = "065"[c]-'0';
}
if (tag == 0x10 && type == 4)
unique_id = get4();
------------------------------------------------------------------------------
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
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
