Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8531
Modified Files:
dcraw.cc dcraw_api.cc
Log Message:
Update error handling to current dcraw.c code.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- dcraw.cc 22 Oct 2009 03:25:32 -0000 1.201
+++ dcraw.cc 24 Oct 2009 07:05:12 -0000 1.202
@@ -7394,10 +7394,8 @@
maximum = 0x3df;
order = 0x4d4d;
}
-#ifndef DCRAW_NOMAIN
} else if (!strcmp(model,"*ist D")) {
data_error = -1;
-#endif
} else if (!strcmp(model,"*ist DS")) {
height -= 2;
} else if (!strcmp(model,"K20D")) {
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- dcraw_api.cc 18 Oct 2009 16:00:18 -0000 1.57
+++ dcraw_api.cc 24 Oct 2009 07:05:12 -0000 1.58
@@ -222,7 +222,7 @@
d->ifpSize = ftell(d->ifp);
fseek(d->ifp, d->data_offset, SEEK_SET);
(d->*d->load_raw)();
- if (d->data_error) d->lastStatus = DCRAW_ERROR;
+ if (!--d->data_error) d->lastStatus = DCRAW_ERROR;
if (d->zero_is_bad) d->remove_zeroes();
d->bad_pixels(NULL);
if (d->is_foveon) {
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) 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/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
