diff -r -u FreeImage-3.1.0-original\Source\FreeImage\PluginBMP.cpp FreeImage-3.1.0\Source\FreeImage\PluginBMP.cpp
--- FreeImage-3.1.0-original\Source\FreeImage\PluginBMP.cpp	Sun Oct 21 16:50:08 2007
+++ FreeImage-3.1.0\Source\FreeImage\PluginBMP.cpp	Fri May 16 12:10:40 2008
@@ -224,7 +224,7 @@
 				throw(1);
 			}
 			if (status_byte != 0)	{
-				status_byte = MIN(status_byte, end - q);
+				status_byte = MIN<int>(status_byte, end - q);
 				// Encoded mode
 				if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
 					throw(1);
@@ -279,7 +279,7 @@
 					default:
 					{
 						// Absolute mode
-						status_byte = MIN(status_byte, end - q);
+						status_byte = MIN<int>(status_byte, end - q);
 						for (int i = 0; i < status_byte; i++) {
 							if ((i & 0x01) == 0) {
 								if(io->read_proc(&second_byte, sizeof(BYTE), 1, handle) != 1) {
diff -r -u FreeImage-3.1.0-original\Source\FreeImageToolkit\JPEGTransform.cpp FreeImage-3.1.0\Source\FreeImageToolkit\JPEGTransform.cpp
--- FreeImage-3.1.0-original\Source\FreeImageToolkit\JPEGTransform.cpp	Tue May 08 20:04:20 2007
+++ FreeImage-3.1.0\Source\FreeImageToolkit\JPEGTransform.cpp	Sat May 17 13:09:12 2008
@@ -106,7 +106,7 @@
 	
 	// Set up default JPEG parameters
 	transfoptions.force_grayscale = FALSE;
-	transfoptions.crop = FALSE;
+	//transfoptions.crop = FALSE;
 
 	// Select the transform option
 	switch(operation) {
@@ -137,7 +137,7 @@
 			break;
 	}
 	// (perfect == TRUE) ==> fail if there is non-transformable edge blocks
-	transfoptions.perfect = (perfect == TRUE) ? TRUE : FALSE;
+	//transfoptions.perfect = (perfect == TRUE) ? TRUE : FALSE;
 	// Drop non-transformable edge blocks: trim off any partial edge MCUs that the transform can't handle.
 	transfoptions.trim = TRUE;
 
@@ -184,7 +184,7 @@
 		// jpeg_read_coefficients so that memory allocation will be done right
 
 		// Fails right away if perfect flag is TRUE and transformation is not perfect
-		if(transfoptions.perfect && 
+		if(/*transfoptions.perfect && */
 			!jtransform_perfect_transform(srcinfo.image_width, srcinfo.image_height, 
 			srcinfo.max_h_samp_factor * DCTSIZE, srcinfo.max_v_samp_factor * DCTSIZE, 
 			transfoptions.transform)) {