diff --git a/src/main/java/com/iflytop/digester/camera/DiComBaslerCamera.cpp b/src/main/java/com/iflytop/digester/camera/DiComBaslerCamera.cpp index 2f3d5a2..c1a88a2 100644 --- a/src/main/java/com/iflytop/digester/camera/DiComBaslerCamera.cpp +++ b/src/main/java/com/iflytop/digester/camera/DiComBaslerCamera.cpp @@ -21,7 +21,7 @@ void throwException(JNIEnv * env, const char* message) { */ void throwExceptionByErrorCode(JNIEnv* env, GENAPIC_RESULT ret) { char msg[128]; - sprintf_s(msg, "error : %ld", ret); + sprintf(msg, "error : %ld", ret); throwException(env, msg); } diff --git a/src/main/java/com/iflytop/digester/camera/build.sh b/src/main/java/com/iflytop/digester/camera/build.sh index dabd7d9..04fa013 100644 --- a/src/main/java/com/iflytop/digester/camera/build.sh +++ b/src/main/java/com/iflytop/digester/camera/build.sh @@ -1,6 +1,7 @@ #!/bin/bash g++ -Wl,--gc-sections -std=c++11 -shared -fPIC -lstdc++ \ - -o libalgo.so \ + -o libcamera.so \ DiComBaslerCamera.cpp \ - -I/app-java/jdk-18.0.2.1/include \ - -I/app-java/jdk-18.0.2.1/include/linux \ No newline at end of file + -I/app/java/jdk-18.0.2.1/include \ + -I/app/java/jdk-18.0.2.1/include/linux \ + -I/opt/pylon/include diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 6421297..8566493 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -28,5 +28,5 @@ app : bucketVolumeCheckEnable: false opencv-library-path: /userdata/rootfs_overlay/usr/lib/jni/libopencv_java420.so pylon-library-path: /opt/pylon/lib/libpylonc.so.7.2 - pylon-wrapper-path: /app/basler-camera-java-wrapper/libpylonc-wrapper.so + pylon-wrapper-path: /app/camera/libcamera.so emergency-stop-file-path: /sys/class/gpio/gpio102/value \ No newline at end of file