Skip to content

Commit e95a4b6

Browse files
committed
Protect lapack dependent functions in java bindings introducing #ifdef VISP_HAVE_LAPACK. Close #519
1 parent 50d1477 commit e95a4b6

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ ViSP 3.2.0 (released January 21, 2019)
115115
. [#429] vpRobotViper650 getPosition(vpRobot::REFERENCE_FRAME) error
116116
. [#485] CMake error when PCL is build with VTK option VTK_ENABLE_KITS=ON
117117
. [#515] Model-based tracking stops throwing an exception: the image of the straight line is a point!
118+
. [#519] Cannot build java bindings when lapack is not used
118119
----------------------------------------------
119120
ViSP 3.1.0 (released December 22nd, 2017)
120121
- Contributors:

modules/java/generator/gen_java.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ def gen_func(self, ci, fi, prop_name=''):
707707
if fi.name in ['detByLUEigen3', 'svdEigen3', 'inverseByLUEigen3', 'pseudoInverseEigen3', 'inverseByEigen3']:
708708
c_prologue.append('#if defined(VISP_HAVE_EIGEN3)')
709709

710-
if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack']:
710+
if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack', 'inverseByCholeskyLapack', 'inverseByQRLapack']:
711711
c_prologue.append('#if defined(VISP_HAVE_LAPACK)')
712712

713713
if type_dict[fi.ctype]["jni_type"] == "jdoubleArray" and type_dict[fi.ctype]["suffix"] != "[D":
@@ -999,10 +999,9 @@ def gen_func(self, ci, fi, prop_name=''):
999999
if fi.name in ['detByLUEigen3', 'svdEigen3', 'inverseByLUEigen3', 'pseudoInverseEigen3', 'inverseByEigen3']:
10001000
ret += '\n #endif'
10011001

1002-
if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack']:
1002+
if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack', 'inverseByCholeskyLapack', 'inverseByQRLapack']:
10031003
ret += '\n #endif'
10041004

1005-
10061005
rtype = type_dict[fi.ctype].get("jni_type", "jdoubleArray")
10071006
clazz = ci.jname
10081007
cpp_code.write(Template( \

0 commit comments

Comments
 (0)