diff options
author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-08-24 02:44:39 +0000 |
---|---|---|
committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-08-24 02:44:39 +0000 |
commit | 28b2bc57cc0009f4518b29a5385a754117f40028 (patch) | |
tree | 38bbf7720e67c4838b848b001ae7a0f42cc389d0 /java | |
parent | 04467abaa1c5a593b55ee65d77d6fe3e461013b9 (diff) |
If libturbojpeg.jnilib is not found on Mac systems, specifically look for it under /usr/lib, since /usr/lib isn't part of the default java.library.path on that platform.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@861 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'java')
-rw-r--r-- | java/README | 22 | ||||
-rw-r--r-- | java/org/libjpegturbo/turbojpeg/TJLoader.java | 12 |
2 files changed, 15 insertions, 19 deletions
diff --git a/java/README b/java/README index 22e0f73..8bca071 100644 --- a/java/README +++ b/java/README @@ -34,22 +34,10 @@ compressing or decompressing consists of images of the same size, then pre-allocating the buffers is recommended. -Note for OS X users -------------------- - -/usr/lib, the directory under which libturbojpeg.dylib is installed on Mac -systems, is not part of the normal Java library path. Thus, when running a -Java application that uses TurboJPEG/OSS on Mac systems, you will need to pass -an argument of -Djava.library.path=/usr/lib to java. - - -Note for Solaris users +Installation Directory ---------------------- -/opt/libjpeg-turbo/lib, the directory under which libturbojpeg.so is installed -on Solaris systems, is not part of the normal Java library path. Thus, when -running a Java application that uses TurboJPEG/OSS on Solaris systems, you will -need to pass an argument of -Djava.library.path=/opt/libjpeg-turbo/lib to java. -If using a 64-bit data model, then instead pass an argument of --Djava.library.path=/opt/libjpeg-turbo/lib/amd64 to use the 64-bit version of -libturbojpeg.so. +If the TurboJPEG JNI library (libturbojpeg.so, libturbojpeg.jnilib, or +turbojpeg.dll) is not installed under a system library directory or under a +directory specified in LD_LIBRARY_PATH (Unix) or PATH (Windows), then you will +need to pass an argument of -Djava.library.path={path_to_JNI_library} to java. diff --git a/java/org/libjpegturbo/turbojpeg/TJLoader.java b/java/org/libjpegturbo/turbojpeg/TJLoader.java index db77bba..ded963e 100644 --- a/java/org/libjpegturbo/turbojpeg/TJLoader.java +++ b/java/org/libjpegturbo/turbojpeg/TJLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (C)2011 D. R. Commander. All Rights Reserved. + * Copyright (C)2011-2012 D. R. Commander. All Rights Reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -30,6 +30,14 @@ package org.libjpegturbo.turbojpeg; final class TJLoader { static void load() { - System.loadLibrary("turbojpeg"); + try { + System.loadLibrary("turbojpeg"); + } catch (java.lang.UnsatisfiedLinkError e) { + String os = System.getProperty("os.name").toLowerCase(); + if (os.indexOf("mac") >= 0) { + System.load("/usr/lib/libturbojpeg.jnilib"); + } + else throw e; + } } }; |