Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9331
Modified Files:
dcraw.cc dcraw_indi.c
Log Message:
Suppress compiler warnings from GCC 4.8.0.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- dcraw.cc 18 Mar 2013 03:30:13 -0000 1.285
+++ dcraw.cc 31 Mar 2013 04:15:09 -0000 1.286
@@ -2120,8 +2120,9 @@
s = val > 65564 ? 10:12;
x = ~(-1 << (s-1));
val <<= 12-s;
- for (i=0; i < (int) sizeof(buf[0])/(int) sizeof(short); i++)
- buf[c][0][i] = (buf[c][0][i] * val + x) >> s;
+ for (i=0; i < 3; i++)
+ for (j=0; j < 386; j++)
+ buf[c][i][j] = (buf[c][i][j] * val + x) >> s;
last[c] = mul[c];
for (r=0; r <= !c; r++) {
buf[c][1][width/2] = buf[c][2][width/2] = mul[c] << 7;
@@ -2608,6 +2609,10 @@
#define HOLE(row) ((holes >> (((row) - raw_height) & 7)) & 1)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
7))
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
/* Kudos to Rich Taylor for figuring out SMaL's compression algorithm. */
void CLASS smal_decode_segment (unsigned seg[2][2], int holes)
{
@@ -2670,6 +2675,9 @@
}
maximum = 0xff;
}
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
7))
+#pragma GCC diagnostic pop
+#endif
void CLASS smal_v6_load_raw()
{
@@ -4299,7 +4307,7 @@
void CLASS ppg_interpolate()
{
int dir[5] = { 1, width, -1, -width, 1 };
- int row, col, diff[2], guess[2], c, d, i;
+ int row, col, diff[2] = { 0, 0 }, guess[2], c, d, i;
ushort (*pix)[4];
border_interpolate(3);
@@ -4506,6 +4514,10 @@
}
}
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
7))
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
void CLASS blend_highlights()
{
int clip=INT_MAX, row, col, c, i, j;
@@ -4542,6 +4554,9 @@
FORCC image[row*width+col][c] = cam[0][c] / colors;
}
}
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >
7))
+#pragma GCC diagnostic pop
+#endif
#define SCALE (4 >> shrink)
void CLASS recover_highlights()
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- dcraw_indi.c 14 Mar 2013 05:40:11 -0000 1.104
+++ dcraw_indi.c 31 Mar 2013 04:15:09 -0000 1.105
@@ -504,7 +504,7 @@
const int colors, void *dcraw)
{
int dir[5] = { 1, width, -1, -width, 1 };
- int row, col, diff[2], guess[2], c, d, i;
+ int row, col, diff[2] = { 0, 0 }, guess[2], c, d, i;
ushort(*pix)[4];
border_interpolate_INDI(height, width, image, filters, colors, 3);
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
