ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In order to avoid a functional regression with previous releases, the JAR file needs to be able to load either the 64-bit or 32-bit JNI library on Un*x systems.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@950 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2013-04-24 06:21:24 +00:00
parent 441308cffa
commit 00400a0a58
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/org/libjpegturbo/turbojpeg/TJLoader.java.tmpl
View File

@@ -41,7 +41,18 @@ final class TJLoader {
System.load("/usr/lib/libturbojpeg.jnilib");
}
} else {
System.load("%{__libdir}/libturbojpeg.so");
try {
System.load("%{__libdir}/libturbojpeg.so");
} catch (java.lang.UnsatisfiedLinkError e3) {
String libdir = "%{__libdir}";
if (libdir.equals("/opt/libjpeg-turbo/lib64")) {
System.load("/opt/libjpeg-turbo/lib32/libturbojpeg.so");
} else if (libdir.equals("/opt/libjpeg-turbo/lib32")) {
System.load("/opt/libjpeg-turbo/lib64/libturbojpeg.so");
} else {
throw e3;
}
}
}
}
}