Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9876
Modified Files:
dcraw.cc
Log Message:
Fix compiler warnings with GCC 4.7.x.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- dcraw.cc 17 Jan 2014 13:30:14 -0000 1.308
+++ dcraw.cc 18 Jan 2014 13:30:15 -0000 1.309
@@ -661,7 +661,7 @@
if (nbits < 0)
return bitbuf = vbits = reset = 0;
if (nbits == 0 || vbits < 0) return 0;
- while (!reset && vbits < nbits && (c = fgetc(ifp)) != EOF &&
+ while (!reset && vbits < nbits && (c = fgetc(ifp)) != (unsigned) EOF &&
!(reset = zero_after_ff && c == 0xff && fgetc(ifp))) {
bitbuf = (bitbuf << 8) + (uchar) c;
vbits += 8;
@@ -3078,6 +3078,10 @@
return 1;
}
+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 7)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
float CLASS foveon_avg (short *pix, int range[2], float cfilt)
{
int i;
@@ -3091,6 +3095,9 @@
if (range[1] - range[0] == 1) return sum/2;
return (sum - min - max) / (range[1] - range[0] - 1);
}
+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 7)
+#pragma GCC diagnostic pop
+#endif
short * CLASS foveon_make_curve (double max, double mul, double filt)
{
@@ -6634,7 +6641,7 @@
dcraw_message (DCRAW_WARNING,
_("%s: Tail is missing, parsing from head...\n"), ifname_display);
fseek (ifp, 0, SEEK_SET);
- while ((len = get4()) != EOF) {
+ while ((len = get4()) != (unsigned) EOF) {
if (get4() == 0x52454456)
if (is_raw++ == shot_select)
#ifdef HAVE_FSEEKO
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
