Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10852

Modified Files:
        dcraw.cc 
Log Message:
Handle raw files from the SIGMA DPx series as unsupported to avoid lockups.

Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- dcraw.cc    26 Feb 2010 06:00:13 -0000      1.209
+++ dcraw.cc    13 Mar 2010 09:30:18 -0000      1.210
@@ -5997,7 +5997,11 @@
     switch (tag) {
       case 0x47414d49:                 /* IMAG */
       case 0x32414d49:                 /* IMA2 */
-       fseek (ifp, 12, SEEK_CUR);
+       fseek (ifp, 8, SEEK_CUR);
+       if (get4() == 30) {             /* SIGMA DPx cameras are unsupported */
+         is_foveon = 0;
+         return;
+       }
        wide = get4();
        high = get4();
        if (wide > raw_width && high > raw_height) {


------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to