Alien-FreeImage

 view release on metacpan or  search on metacpan

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

 
 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
 ----------------------------------------------------------------
diff -ru src.3170/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c src/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
--- src.3170/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c	2015-03-08 20:53:02.000000000 +0100
+++ src/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c	2017-06-22 22:17:19.446910500 +0200
@@ -548,10 +548,10 @@
 // TEMP3 = SRC[D + D1 * BPS]
 #define LOAD_4_BYTES(TEMP0, TEMP1, TEMP2, TEMP3,                               \
                      A, A1, B, B1, C, C1, D, D1, SRC)                          \
-  "lbu          %["#TEMP0"],   "#A"+"#A1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
-  "lbu          %["#TEMP1"],   "#B"+"#B1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
-  "lbu          %["#TEMP2"],   "#C"+"#C1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
-  "lbu          %["#TEMP3"],   "#D"+"#D1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
+  "lbu      %[" #TEMP0 "],   " #A "+" #A1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
+  "lbu      %[" #TEMP1 "],   " #B "+" #B1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
+  "lbu      %[" #TEMP2 "],   " #C "+" #C1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
+  "lbu      %[" #TEMP3 "],   " #D "+" #D1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
 
 static void SimpleHFilter16(uint8_t* p, int stride, int thresh) {
   int i;
@@ -623,8 +623,8 @@
 // DST[A * BPS]     = TEMP0
 // DST[B + C * BPS] = TEMP1
 #define STORE_8_BYTES(TEMP0, TEMP1, A, B, C, DST)                              \
-  "usw          %["#TEMP0"],   "#A"*"XSTR(BPS)"(%["#DST"])         \n\t"       \
-  "usw          %["#TEMP1"],   "#B"+"#C"*"XSTR(BPS)"(%["#DST"])    \n\t"
+  "usw    %[" #TEMP0 "],   " #A "*"XSTR(BPS)"(%[" #DST "])         \n\t"       \
+  "usw    %[" #TEMP1 "],   " #B "+" #C "*"XSTR(BPS)"(%[" #DST "])  \n\t"
 
 static void VE4(uint8_t* dst) {    // vertical
   const uint8_t* top = dst - BPS;
@@ -725,8 +725,8 @@
 // TEMP0 = SRC[A * BPS]
 // TEMP1 = SRC[B + C * BPS]
 #define LOAD_8_BYTES(TEMP0, TEMP1, A, B, C, SRC)                               \
-  "ulw          %["#TEMP0"],   "#A"*"XSTR(BPS)"(%["#SRC"])         \n\t"       \
-  "ulw          %["#TEMP1"],   "#B"+"#C"*"XSTR(BPS)"(%["#SRC"])    \n\t"
+  "ulw    %[" #TEMP0 "],   " #A "*"XSTR(BPS)"(%[" #SRC "])         \n\t"       \
+  "ulw    %[" #TEMP1 "],   " #B "+" #C "*"XSTR(BPS)"(%[" #SRC "])  \n\t"
 
 static void LD4(uint8_t* dst) {   // Down-Left
   int temp0, temp1, temp2, temp3, temp4;
@@ -873,24 +873,24 @@
 #define CLIPPING(SIZE)                                                         \
   "preceu.ph.qbl   %[temp2],   %[temp0]                  \n\t"                 \
   "preceu.ph.qbr   %[temp0],   %[temp0]                  \n\t"                 \
-".if "#SIZE" == 8                                        \n\t"                 \
+".if " #SIZE " == 8                                      \n\t"                 \
   "preceu.ph.qbl   %[temp3],   %[temp1]                  \n\t"                 \
   "preceu.ph.qbr   %[temp1],   %[temp1]                  \n\t"                 \
 ".endif                                                  \n\t"                 \
   "addu.ph         %[temp2],   %[temp2],   %[dst_1]      \n\t"                 \
   "addu.ph         %[temp0],   %[temp0],   %[dst_1]      \n\t"                 \
-".if "#SIZE" == 8                                        \n\t"                 \
+".if " #SIZE " == 8                                      \n\t"                 \
   "addu.ph         %[temp3],   %[temp3],   %[dst_1]      \n\t"                 \
   "addu.ph         %[temp1],   %[temp1],   %[dst_1]      \n\t"                 \
 ".endif                                                  \n\t"                 \
   "shll_s.ph       %[temp2],   %[temp2],   7             \n\t"                 \
   "shll_s.ph       %[temp0],   %[temp0],   7             \n\t"                 \
-".if "#SIZE" == 8                                        \n\t"                 \



( run in 0.493 second using v1.01-cache-2.11-cpan-140bd7fdf52 )