[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit ac3cff4bb216aac8dfd36dc88c1976d3db54ec57
Author: aCaB <acab at clamav.net>
Date:   Fri Dec 11 01:46:23 2009 +0100

    fix build failures on solaris8 and VC

diff --git a/libclamav/pe_icons.c b/libclamav/pe_icons.c
index 58ce44b..f35506b 100644
--- a/libclamav/pe_icons.c
+++ b/libclamav/pe_icons.c
@@ -1390,9 +1390,9 @@ static int parseicon(unsigned int *grp1, unsigned int *grp2, uint32_t rva, cli_c
 	    memset(newdata, 0xaaccaabb, newsize * newsize * sizeof(*newdata));
 	    cli_dbgmsg("Slow scaling to %ux%u (%f, %f)\n", newsize, newsize, scalex, scaley);
 	    for(y = 0; y<newsize; y++) {
-		unsigned int oldy = round(y * scaley) * width;
+		unsigned int oldy = (unsigned int)((y * scaley) * width + 0.5f);
 		for(x = 0; x<newsize; x++)
-		    newdata[y*newsize + x] = imagedata[oldy + (unsigned int)round(x * scalex)];
+		    newdata[y*newsize + x] = imagedata[oldy + (unsigned int)(x * scalex + 0.5f)];
 	    }
 	    free(imagedata);
 	    height = newsize;
diff --git a/win32/libclamav.vcproj b/win32/libclamav.vcproj
index 1c18eb6..871242d 100644
--- a/win32/libclamav.vcproj
+++ b/win32/libclamav.vcproj
@@ -377,6 +377,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\libclamav\pe_icons.c"
+				>
+			</File>
+			<File
 				RelativePath="..\libclamav\petite.c"
 				>
 			</File>

-- 
Debian repository for ClamAV