Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Checked compat with JNA 5.11.0 #139

Merged
merged 1 commit into from
Sep 13, 2022
Merged

Checked compat with JNA 5.11.0 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>32.0.0-beta-6</version>
<version>33.0.0</version>
<relativePath />
</parent>

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fiji/plugin/Multi_View_Deconvolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/spim/process/cuda/NativeLibraryTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down