Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-2.sog:/tmp/cvs-serv25998
Modified Files:
dcraw.cc dcraw_api.cc dcraw_indi.c
Log Message:
Fix some gcc 4.6 warnings and ignore some others.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- dcraw.cc 25 May 2011 15:15:59 -0000 1.242
+++ dcraw.cc 11 Jul 2011 04:14:18 -0000 1.243
@@ -24,6 +24,11 @@
#define DCRAW_VERSION "9.08"
+// dcraw plays with array bounds everywhere, there is no point to warn about
it.
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >=
6)) && !defined(__INTEL_COMPILER)
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- dcraw_api.cc 27 Feb 2011 02:48:32 -0000 1.76
+++ dcraw_api.cc 11 Jul 2011 04:14:18 -0000 1.77
@@ -422,7 +422,7 @@
int scale)
{
DCRaw *d = (DCRaw *)hh->dcraw;
- int h, w, fujiWidth, r, c, ri, recombine, pixels, f4;
+ int h, w, fujiWidth, r, c, ri, recombine, f4;
dcraw_image_type *ibase, *obase;
unsigned *fseq;
unsigned short *pixp;
@@ -430,7 +430,6 @@
g_free(d->messageBuffer);
d->messageBuffer = NULL;
d->lastStatus = DCRAW_SUCCESS;
- pixels = hh->raw.width * hh->raw.height;
recombine = (hh->colors == 3 && hh->raw.colors == 4);
/* the last row/column will be skipped if input is incomplete */
@@ -677,13 +676,12 @@
int interpolation, int smoothing)
{
DCRaw *d = (DCRaw *)h->dcraw;
- int fujiWidth, i, r, c, cl, pixels;
+ int fujiWidth, i, r, c, cl;
unsigned ff, f4;
g_free(d->messageBuffer);
d->messageBuffer = NULL;
d->lastStatus = DCRAW_SUCCESS;
- pixels = h->raw.width * h->raw.height;
f->width = h->width;
f->height = h->height;
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- dcraw_indi.c 17 Apr 2011 11:00:28 -0000 1.90
+++ dcraw_indi.c 11 Jul 2011 04:14:18 -0000 1.91
@@ -215,7 +215,6 @@
unsigned /*bottom, right, size,*/ row, col, /*ur, uc, i, x, y,*/ c, sum[8];
int val, dark, sat;
double /*dsum[8],*/ dmin, dmax;
- float scale_mul[4]/*, fr, fc*/;
if (use_camera_wb && cam_mul[0] != -1) {
memset(sum, 0, sizeof sum);
@@ -248,7 +247,6 @@
if (dmax < pre_mul[c])
dmax = pre_mul[c];
}
- FORC4 scale_mul[c] = (pre_mul[c] /= dmax) * 65535.0 / maximum;
dcraw_message(dcraw, DCRAW_VERBOSE,
_("Scaling with darkness %d, saturation %d, and\nmultipliers"),
dark, sat);
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
