UFRaw

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28202

Modified Files:
	ufraw_conf.c 
Log Message:
Fix a very improbable memory flow related to ProductName.


Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- ufraw_conf.c	10 May 2007 22:05:36 -0000	1.57
+++ ufraw_conf.c	27 May 2007 22:22:41 -0000	1.58
@@ -338,7 +338,7 @@
         if (!strcmp("File", element))
             g_strlcpy(c->profile[in_profile][i].file, temp, max_path);
         if (!strcmp("ProductName", element))
-            g_strlcpy(c->profile[in_profile][i].productName, temp, max_path);
+            g_strlcpy(c->profile[in_profile][i].productName, temp, max_name);
         if (!strcmp("Gamma", element))
             sscanf(temp, "%lf", &c->profile[in_profile][i].gamma);
         if (!strcmp("Linearity", element))

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21901

Modified Files:
	ufraw_exiv2.cc 
Log Message:
Delete thumbnail if EXIF data is too long.


Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ufraw_exiv2.cc	30 Apr 2007 21:33:27 -0000	1.15
+++ ufraw_exiv2.cc	27 May 2007 22:06:19 -0000	1.16
@@ -84,6 +84,13 @@
 	    buf = exifData.copy();
 	}
     }
+    if ( buf.size_+sizeof(ExifHeader)>65533 ) {
+	exifData.eraseThumbnail();
+	ufraw_message(UFRAW_SET_LOG,
+		"buflen %d too big, erasing Thumbnail\n",
+		buf.size_+sizeof(ExifHeader));
+	buf = exifData.copy();
+    }
     uf->exifBufLen = buf.size_ + sizeof(ExifHeader);
     uf->exifBuf = g_new(unsigned char, uf->exifBufLen);
     memcpy(uf->exifBuf, ExifHeader, sizeof(ExifHeader));

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17257

Modified Files:
	ufraw_preview.c 
Log Message:
Fix the spot WB.


Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- ufraw_preview.c	26 May 2007 03:30:23 -0000	1.99
+++ ufraw_preview.c	27 May 2007 19:10:00 -0000	1.100
@@ -1124,13 +1124,16 @@
 	    * width / data->UF->predictedWidth + 1;
     spotStartX = MIN(data->SpotX1, data->SpotX2)
 	    * width / data->UF->predictedWidth;
-    ufraw_image_data *image = &data->UF->Images[ufraw_final_phase];
+    ufraw_image_data *image = &data->UF->Images[ufraw_first_phase];
 
     for (c=0; c<4; c++) rgb[c] = 0;
     for (y=spotStartY; y<spotStartY+spotSizeY; y++)
         for (x=spotStartX; x<spotStartX+spotSizeX; x++)
-            for (c=0; c<data->UF->colors; c++)
-                rgb[c] += image->buffer[(y*image->width + x)*image->depth + c];
+            for (c=0; c<data->UF->colors; c++) {
+		guint16 *pixie = (guint16*)(image->buffer +
+			(y*image->width + x)*image->depth);
+                rgb[c] += pixie[c];
+	    }
     for (c=0; c<4; c++) rgb[c] = MAX(rgb[c], 1);
     for (c=0; c<data->UF->colors; c++)
         CFG->chanMul[c] = (double)spotSizeX * spotSizeY * data->UF->rgbMax