Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv9304
Modified Files:
dcraw.cc ufraw_writer.c
Log Message:
Fix a couple of compiler warnings on FreeBSD 8.2-RELEASE.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- dcraw.cc 7 Aug 2011 04:30:41 -0000 1.249
+++ dcraw.cc 27 Aug 2011 09:05:47 -0000 1.250
@@ -1479,7 +1479,7 @@
wide = head[2] / head[4];
mrow = (float *) calloc (nc*wide, sizeof *mrow);
merror (mrow, "phase_one_flat_field()");
- for (y=0; y < head[3] / head[5]; y++) {
+ for (y=0; y < (unsigned)(head[3] / head[5]); y++) {
for (x=0; x < wide; x++)
for (c=0; c < nc; c+=2) {
num = is_float ? getreal(11) : get2()/32768.0;
Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ufraw_writer.c 14 Aug 2011 07:00:22 -0000 1.76
+++ ufraw_writer.c 27 Aug 2011 09:05:47 -0000 1.77
@@ -818,7 +818,12 @@
*dp++ = '\n';
*dp = '\0';
+#if ((PNG_LIBPNG_VER_MAJOR > 1) || ((PNG_LIBPNG_VER_MAJOR == 1) && \
+(PNG_LIBPNG_VER_MINOR > 2))) && (defined(INT_MAX) && (INT_MAX > 0x7ffffffeL))
+ g_snprintf(dp, allocated_length - strlen(text[0].text), "%8u ", length);
+#else
g_snprintf(dp, allocated_length - strlen(text[0].text), "%8lu ", length);
+#endif
dp += 8;
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
