Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > da1cabb3da77d5c4fa703f4675a671a4 > files > 4

freeimage-3.154-1.1.mga5.src.rpm

Patch that fixes several problems for building on amd64. Thanks Fedora guys.
=====================================================================
--- freeimage.orig/Source/FreeImage/PluginBMP.cpp
+++ freeimage/Source/FreeImage/PluginBMP.cpp
@@ -192,6 +192,8 @@ LoadPixelData(FreeImageIO *io, fi_handle
 	return TRUE;
 }
 
+#define MIN(a, b) ( ((a) < (b))? (a):(b) )
+
 /**
 Load image pixels for 4-bit RLE compressed dib
 @param io FreeImage IO
--- freeimage.orig/Source/FreeImage.h
+++ freeimage/Source/FreeImage.h
@@ -141,8 +141,10 @@ typedef uint8_t BYTE;
 typedef uint16_t WORD;
 typedef uint32_t DWORD;
 typedef int32_t LONG;
+#ifndef _LIBRAW_TYPES_H
 typedef int64_t INT64;
 typedef uint64_t UINT64;
+#endif
 #else
 // MS is not C99 ISO compliant
 typedef long BOOL;