Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32159
Modified Files:
dcraw.cc
Log Message:
Fix some fseeko()/fseek() and ftello()/ftell() problems.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- dcraw.cc 16 Mar 2013 18:15:09 -0000 1.283
+++ dcraw.cc 17 Mar 2013 18:30:18 -0000 1.284
@@ -6324,7 +6324,11 @@
width = get4();
height = get4();
fseek (ifp, 0, SEEK_END);
+#ifdef HAVE_FSEEKO
fseek (ifp, -(i = ftello(ifp) & 511), SEEK_CUR);
+#else
+ fseek (ifp, -(i = ftell(ifp) & 511), SEEK_CUR);
+#endif
if (get4() != i || get4() != 0x52454f42) {
dcraw_message (DCRAW_WARNING,
_("%s: Tail is missing, parsing from head...\n"), ifname_display);
@@ -6332,14 +6336,22 @@
while ((len = get4()) != EOF) {
if (get4() == 0x52454456)
if (is_raw++ == shot_select)
+#ifdef HAVE_FSEEKO
data_offset = ftello(ifp) - 8;
+#else
+ data_offset = ftell(ifp) - 8;
+#endif
fseek (ifp, len-8, SEEK_CUR);
}
} else {
rdvo = get4();
fseek (ifp, 12, SEEK_CUR);
is_raw = get4();
+#ifdef HAVE_FSEEKO
fseeko (ifp, rdvo+8 + shot_select*4, SEEK_SET);
+#else
+ fseek (ifp, rdvo+8 + shot_select*4, SEEK_SET);
+#endif
data_offset = get4();
}
}
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
