Alien-FreeImage

 view release on metacpan or  search on metacpan

patches/FreeImage-3.17.0-ALL-IN-ONE.patch  view on Meta::CPAN

diff -ru src.3170/Makefile.cygwin src/Makefile.cygwin
--- src.3170/Makefile.cygwin	2015-03-08 17:03:50.000000000 +0100
+++ src/Makefile.cygwin	2017-06-25 22:26:39.876903000 +0200
@@ -32,12 +32,10 @@
 
 all: dist
 
-dist: FreeImage
-	mkdir -p Dist
-	cp *.a Dist/
-	cp *.dll Dist/
-	cp *.dll.a Dist/
-	cp $(HEADER) Dist/
+dist: $(STATICLIB) $(HEADER)
+	mkdir -p $(DISTDIR)
+	cp $(STATICLIB) $(DISTDIR)
+	cp $(HEADER) $(DISTDIR)
 
 dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
diff -ru src.3170/Makefile.gnu src/Makefile.gnu
--- src.3170/Makefile.gnu	2015-03-08 17:04:00.000000000 +0100
+++ src/Makefile.gnu	2017-06-22 23:20:43.835208600 +0200
@@ -46,11 +46,11 @@
 
 all: dist
 
-dist: FreeImage
-	mkdir -p Dist
-	cp *.a Dist/
-	cp *.so Dist/
-	cp Source/FreeImage.h Dist/
+dist: $(STATICLIB) $(HEADER)
+	mkdir -p $(DISTDIR)
+	cp $(STATICLIB) $(DISTDIR)
+	cp $(HEADER) $(DISTDIR)
+ 
 
 dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
diff -ru src.3170/Makefile.mingw src/Makefile.mingw
--- src.3170/Makefile.mingw	2015-03-08 17:04:12.000000000 +0100
+++ src/Makefile.mingw	2017-06-27 10:00:56.255544400 +0200
@@ -32,14 +32,16 @@
 #Define the resource compiler.
 RC = windres
 
+PERL=perl
+
-CP = cp
+CP = $(PERL) -MExtUtils::Command -e cp --
 
-MD = mkdir
+MKPATH = $(PERL) -MExtUtils::Command -e mkpath --
 
-RM = rm
+RM_F = $(PERL) -MExtUtils::Command -e rm_f --
 
 # Define additional libraries needed.
 # libstdc++ is included by default with MinGW, however for
@@ -125,7 +127,7 @@
 	$(LD) $(LDFLAGS) -o $@ $(EXPORTLIB) $(MODULES) $(RESOURCE) $(LIBRARIES)
 
 $(DISTDIR):
-	$(MD) $(DISTDIR)
+	$(MKPATH) $(DISTDIR)
 
 $(TARGETDIST): $(DISTDIR)
 
@@ -133,4 +135,4 @@
 	$(CP) $(SHAREDLIB) $(INSTALLDIR)
 
 clean:
-	$(RM) -f core $(DISTDIR)/*.* $(MODULES) $(RESOURCE) $(STATICLIB) $(SHAREDLIB) $(IMPORTLIB) $(EXPORTLIB)
+	$(RM_F) core $(DISTDIR)/*.* $(MODULES) $(RESOURCE) $(STATICLIB) $(SHAREDLIB) $(IMPORTLIB) $(EXPORTLIB)
diff -ru src.3170/Makefile.osx src/Makefile.osx
--- src.3170/Makefile.osx	2015-03-08 17:04:16.000000000 +0100
+++ src/Makefile.osx	2017-06-27 09:40:31.032975100 +0200
@@ -54,11 +54,10 @@
 
 all: dist
 
-dist: FreeImage
-	mkdir -p Dist
-	cp *.a Dist/
-	cp *.dylib Dist/
-	cp Source/FreeImage.h Dist/
+dist: $(STATICLIB) Source/FreeImage.h
+	mkdir -p $(DISTDIR)
+	cp $(STATICLIB) $(DISTDIR)
+	cp Source/FreeImage.h $(DISTDIR)
 
 FreeImage: $(STATICLIB) $(SHAREDLIB)
 
diff -ru src.3170/Makefile.solaris src/Makefile.solaris
--- src.3170/Makefile.solaris	2017-06-27 09:37:42.676030800 +0200
+++ src/Makefile.solaris	2017-06-27 09:38:35.684478900 +0200
@@ -33,11 +33,10 @@
 
 all: dist
 
-dist: FreeImage
-	mkdir -p Dist
-	cp *.a Dist/
-	cp *.so Dist/
-	cp Source/FreeImage.h Dist/
+dist: $(STATICLIB) Source/FreeImage.h
+	mkdir -p $(DISTDIR)
+	cp $(STATICLIB) $(DISTDIR)
+	cp Source/FreeImage.h $(DISTDIR)
 
 dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
diff -ru src.3170/Source/LibJXR/image/sys/strcodec.c src/Source/LibJXR/image/sys/strcodec.c
--- src.3170/Source/LibJXR/image/sys/strcodec.c	2015-03-02 01:07:10.000000000 +0100
+++ src/Source/LibJXR/image/sys/strcodec.c	2017-06-22 22:59:12.715416800 +0200
@@ -671,6 +671,7 @@
 #ifdef _BIG__ENDIAN_
 #define _byteswap_ulong(x)  (x)
 #else // _BIG__ENDIAN_
+#ifndef __MINGW32__
 U32 _byteswap_ulong(U32 bits)
 {
     U32 r = (bits & 0xffu) << 24;
@@ -680,6 +681,7 @@
 
     return r;
 }
+#endif
 #endif // _BIG__ENDIAN_
 #endif
 
diff -ru src.3170/Source/LibRawLite/internal/dcraw_common.cpp src/Source/LibRawLite/internal/dcraw_common.cpp
--- src.3170/Source/LibRawLite/internal/dcraw_common.cpp	2015-03-08 20:27:50.000000000 +0100
+++ src/Source/LibRawLite/internal/dcraw_common.cpp	2017-06-22 22:54:30.801347900 +0200
@@ -4525,22 +4525,22 @@
     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
     -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
     -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
-    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
-    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
+    -1,-2,-1,+0,0,(signed char)0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char)0x88, -1,-1,+1,-2,0,0x40,
     -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
     -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
     -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
     -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
     -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
     -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
-    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
+    +0,-2,+0,+0,1,(signed char)0x80, +0,-1,+0,+1,1,(signed char)0x88, +0,-1,+1,-2,0,0x40,
     +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
     +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
     +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
     +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
     +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
-    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
-    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char)0x80,
+    +1,-1,+1,+1,0,(signed char)0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
     +1,+0,+2,+1,0,0x10
   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
   ushort (*brow[5])[4], *pix;
diff -ru src.3170/Source/LibRawLite/internal/libraw_x3f.cpp src/Source/LibRawLite/internal/libraw_x3f.cpp
--- src.3170/Source/LibRawLite/internal/libraw_x3f.cpp	2014-08-31 23:45:02.000000000 +0200
+++ src/Source/LibRawLite/internal/libraw_x3f.cpp	2017-06-26 19:50:06.806762000 +0200
@@ -1,4 +1,4 @@
-/* Library for accessing X3F Files 
+/* Library for accessing X3F Files 
 ----------------------------------------------------------------
 BSD-style License
 ----------------------------------------------------------------



( run in 2.228 seconds using v1.01-cache-2.11-cpan-64ef6c95b5d )