From 0d501fda72c6471b8295515a0e9d5cef46c9ceab Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Tue, 14 Jun 2022 15:09:17 -0400 Subject: [PATCH] Update to JNA 5.11.0 * Update scijava-pom to 33.0.0. * Checked compat with JNA 5.11.0. * Use Native.load rather than Native.loadLibrary. Signed-off-by: Curtis Rueden --- pom.xml | 2 +- src/main/java/fiji/plugin/Multi_View_Deconvolution.java | 4 ++-- src/main/java/spim/process/cuda/NativeLibraryTools.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 37012992..8b0f8fc3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava - 32.0.0-beta-6 + 33.0.0 diff --git a/src/main/java/fiji/plugin/Multi_View_Deconvolution.java b/src/main/java/fiji/plugin/Multi_View_Deconvolution.java index f9745063..fc3a77fb 100644 --- a/src/main/java/fiji/plugin/Multi_View_Deconvolution.java +++ b/src/main/java/fiji/plugin/Multi_View_Deconvolution.java @@ -852,10 +852,10 @@ else if ( blockSizeIndex == 6 ) { //String fijiDir = new File( "names.txt" ).getAbsoluteFile().getParentFile().getAbsolutePath(); //IJ.log( "Fiji directory: " + fijiDir ); - //LRFFT.cuda = (CUDAConvolution) Native.loadLibrary( fijiDir + File.separator + "libConvolution3D_fftCUDAlib.so", CUDAConvolution.class ); + //LRFFT.cuda = (CUDAConvolution) Native.load( fijiDir + File.separator + "libConvolution3D_fftCUDAlib.so", CUDAConvolution.class ); // under linux automatically checks lib/linux64 - LRFFT.cuda = (CUDAFourierConvolution) Native.loadLibrary( "Convolution3D_fftCUDAlib", CUDAFourierConvolution.class ); + LRFFT.cuda = (CUDAFourierConvolution) Native.load( "Convolution3D_fftCUDAlib", CUDAFourierConvolution.class ); } catch (UnsatisfiedLinkError e ) { diff --git a/src/main/java/spim/process/cuda/NativeLibraryTools.java b/src/main/java/spim/process/cuda/NativeLibraryTools.java index 2be3894e..08c4d176 100644 --- a/src/main/java/spim/process/cuda/NativeLibraryTools.java +++ b/src/main/java/spim/process/cuda/NativeLibraryTools.java @@ -142,7 +142,7 @@ public boolean accept( final File dir, final String name ) final String fullPath = new File( dir.getAbsolutePath(), gd.getNextChoice() ).getAbsolutePath(); IOFunctions.println( "Trying to load following library: " + fullPath ); - return (L)Native.loadLibrary( fullPath, libraryClass ); + return (L)Native.load( fullPath, libraryClass ); } catch ( UnsatisfiedLinkError e ) {