Recompiled linux library with static linking of libgcc. Updated build

script to latest MacOS SDK. Update version

Author: Andrea Medeghini

Makefile.jni.linux

@@ -5,4 +5,4 @@ JAVA_HOME=/usr/lib/jvm/java-8-oracle
 OUTPUT_DIR=$(BUILD_DIR)/com.nextbreakpoint.freeimage4java/src/main/resources/linux
 
 all: 	
-	mkdir -p $(OUTPUT_DIR) && g++ --verbose -o $(OUTPUT_DIR)/libfreeimage4java.so -L. -ISource -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -shared -fPIC -Wall -m$(LIB_TYPE) -Wl,-Bsymbolic -DFREEIMAGE_LIB $(BUILD_DIR)/freeimage4java_wrap.cxx -lm -lfreeimage 
+	mkdir -p $(OUTPUT_DIR) && g++ --verbose -o $(OUTPUT_DIR)/libfreeimage4java.so -L. -ISource -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -shared -fPIC -Wall -m$(LIB_TYPE) -Wl,-Bsymbolic -DFREEIMAGE_LIB $(BUILD_DIR)/freeimage4java_wrap.cxx -lm -lfreeimage -static-libstdc++ -static-libgcc

Makefile.lib.macos

@@ -25,7 +25,7 @@ SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib
 LIBNAME = lib$(TARGET).$(VER_MAJOR).dylib
 HEADER = Source/FreeImage.h
 
-MACOS_SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/
+MACOS_SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/
 
 # Define the copy command.
 CP = cp

Patch.linux

@@ -0,0 +1,13 @@
+diff --git /FreemImage/Source/LibJXR/image/encode/strenc.c /FreemImage/Source/LibJXR/image/encode/strenc.c
+index d6e970e..1c68109 100644
+--- /FreeImage/Source/LibJXR/image/encode/strenc.c
++++ /FreeImage/Source/LibJXR/image/encode/strenc.c
+@@ -482,7 +482,7 @@ Int StrIOEncInit(CWMImageStrCodec* pSC)
+                 pSC->ppTempFile[i] = (char *)malloc(FILENAME_MAX * sizeof(char));
+                 if(pSC->ppTempFile[i] == NULL) return ICERR_ERROR;
+ 
+-                if ((pFilename = tmpnam(NULL)) == NULL)
++                if ((pFilename = mkstemp(NULL)) == NULL)
+                     return ICERR_ERROR;                
+                 strcpy(pSC->ppTempFile[i], pFilename);
+ #endif

README.md

@@ -1,4 +1,4 @@
-# FreeImage4Java 3.18.0-1.0
+# FreeImage4Java 3.18.0-1.1
 
 FreeImage4Java provides a JNI wrapper of FreeImage library version 3.18.0.
 

maven/com.nextbreakpoint.freeimage4java/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.nextbreakpoint</groupId>
 	<artifactId>com.nextbreakpoint.freeimage4java</artifactId>
-	<version>3.18.0-1.0</version>
+	<version>3.18.0-1.1</version>
 	<packaging>jar</packaging>
 	<name>FreeImage4Java</name>
 	<description>FreeImage4Java provides a JNI wrapper of FreeImage library</description>

tests/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.nextbreakpoint</groupId>
 	<artifactId>com.nextbreakpoint.freeimage4java.tests</artifactId>
-	<version>3.18.0-1.0</version>
+	<version>3.18.0-1.1</version>
 	<packaging>jar</packaging>
 	<name>Tests of FreeImage4Java</name>
 	<description>FreeImage4Java provides a JNI wrapper of FreeImage library</description>
@@ -82,7 +82,7 @@
 		<dependency>
 			<groupId>com.nextbreakpoint</groupId>
 			<artifactId>com.nextbreakpoint.freeimage4java</artifactId>
-			<version>3.18.0-1.0</version>
+			<version>3.18.0-1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>