--- Source/FreeImage/PluginBMP.cpp.orig	2008-03-20 00:03:21.000000000 +0100
+++ Source/FreeImage/PluginBMP.cpp	2008-03-20 00:04:10.000000000 +0100
@@ -26,6 +26,10 @@
 #include "FreeImage.h"
 #include "Utilities.h"
 
+#ifndef MIN
+#define MIN(a,b) (a <= b ? a : b)
+#endif
+
 // ----------------------------------------------------------
 //   Constants + headers
 // ----------------------------------------------------------
--- Source/Metadata/Exif.cpp.orig	2008-03-20 00:13:33.000000000 +0100
+++ Source/Metadata/Exif.cpp	2008-03-20 00:14:17.000000000 +0100
@@ -495,7 +495,7 @@
 		}
 
 		// remember that we've visited this directory so that we don't visit it again later
-		DWORD visited = (((DWORD)ifdp & 0xFFFF) << 16) | (DWORD)de;
+		DWORD visited = (((size_t)ifdp & 0xFFFF) << 16) | (DWORD)de;
 		if(visitedIFD.find(visited) != visitedIFD.end()) {
 			continue;
 		} else {