Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5852
Modified Files:
dcraw.cc dcraw_indi.c
Log Message:
Suppress more valgrind errors. The compiler warning fix in dcraw_indi.c caused
an error in valgrind.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- dcraw.cc 4 Oct 2009 09:00:24 -0000 1.195
+++ dcraw.cc 6 Oct 2009 03:30:13 -0000 1.196
@@ -131,6 +131,7 @@
output_color=1, output_bps=8, output_tiff=0, med_passes=0, no_auto_bright=0;
greybox[0] = greybox[1] = 0, greybox[2] = greybox[3] = UINT_MAX;
tone_curve_size = 0, tone_curve_offset = 0; /* Nikon Tone Curves UF*/
+tone_mode_offset = 0, tone_mode_size = 0; /* Nikon ToneComp UF*/
messageBuffer = NULL;
lastStatus = DCRAW_SUCCESS;
ifname = NULL;
@@ -6738,7 +6739,6 @@
}
colors = 3;
for (i=0; i < 0x4000; i++) curve[i] = i;
- tone_curve_offset = tone_curve_size = 0; /*UF*/
order = get2();
hlen = get4();
@@ -6840,9 +6840,9 @@
(cp = strstr(model,"FILE VERSION"))))
*cp = 0;
cp = make + strlen(make); /* Remove trailing spaces */
- while (*--cp == ' ') *cp = 0;
+ while (make[0] != 0 && *--cp == ' ') *cp = 0;
cp = model + strlen(model);
- while (*--cp == ' ') *cp = 0;
+ while (model[0] != 0 && *--cp == ' ') *cp = 0;
i = strlen(make); /* Remove make from model */
if (!strncasecmp (model, make, i) && model[i++] == ' ')
memmove (model, model+i, 64-i);
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- dcraw_indi.c 27 Sep 2009 22:39:39 -0000 1.76
+++ dcraw_indi.c 6 Oct 2009 03:30:13 -0000 1.77
@@ -541,8 +541,8 @@
memcpy (image[(row-2)*width+2], brow[0]+2, (width-4)*sizeof *image);
}
if (row == height - 2) {
- memcpy (image[(row-2)*width+2], &rowtmp[0]+2, (width-4)*sizeof *image);
- memcpy (image[(row-1)*width+2], &rowtmp[1]+2, (width-4)*sizeof *image);
+ memcpy (image[(row-2)*width+2], brow[0]+2, (width-4)*sizeof *image);
+ memcpy (image[(row-1)*width+2], brow[1]+2, (width-4)*sizeof *image);
}
}
free(ipalloc);
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
