diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp index 51470511..591f2f99 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp @@ -35,15 +35,25 @@ typedef std::function)> FilterCallback; /** * @brief Get the type of a PropertyRange member */ -template struct RangeTraits { using valueType = void; }; +template struct RangeTraits { + using valueType = void; +}; -template <> struct RangeTraits { using valueType = uint8_t; }; +template <> struct RangeTraits { + using valueType = uint8_t; +}; -template <> struct RangeTraits { using valueType = uint16_t; }; +template <> struct RangeTraits { + using valueType = uint16_t; +}; -template <> struct RangeTraits { using valueType = uint32_t; }; +template <> struct RangeTraits { + using valueType = uint32_t; +}; -template <> struct RangeTraits { using valueType = float; }; +template <> struct RangeTraits { + using valueType = float; +}; /** * @brief Get T Property Range diff --git a/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake b/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake index 2865bcf0..ce05f521 100644 --- a/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake +++ b/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1) # Import target "ob::OrbbecSDK" for configuration "Release" set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(ob::OrbbecSDK PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.2" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.3" IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2" ) list(APPEND _cmake_import_check_targets ob::OrbbecSDK ) -list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.2" ) +list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.3" ) # Commands beyond this point should not need to know the version. set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake b/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake index 9497c033..cfbccf3a 100644 --- a/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake +++ b/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.9.2") +set(PACKAGE_VERSION "2.9.3") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.9.2" MATCHES "^([0-9]+)\\.") + if("2.9.3" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "2.9.2") + set(CVF_VERSION_MAJOR "2.9.3") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libengine_infer_encry.so b/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libengine_infer_encry.so index 52d87151..ebae33f7 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libengine_infer_encry.so and b/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libengine_infer_encry.so differ diff --git a/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libenhanced_depth_filter.so b/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libenhanced_depth_filter.so index b21c0dd3..85ce9415 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libenhanced_depth_filter.so and b/orbbec_camera/SDK/lib/arm64/extensions/filters/enhanced_depth_filter/libenhanced_depth_filter.so differ diff --git a/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so b/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so index 61bde2c6..250efc5f 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so and b/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so differ diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 index 19f11db1..07122dbb 120000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 @@ -1 +1 @@ -libOrbbecSDK.so.2.9.2 \ No newline at end of file +libOrbbecSDK.so.2.9.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.2 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.3 similarity index 87% rename from orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.2 rename to orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.3 index 261f758e..0d768c8e 100644 Binary files a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.2 and b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.9.3 differ diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake index 2865bcf0..ce05f521 100644 --- a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake @@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1) # Import target "ob::OrbbecSDK" for configuration "Release" set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(ob::OrbbecSDK PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.2" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.3" IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2" ) list(APPEND _cmake_import_check_targets ob::OrbbecSDK ) -list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.2" ) +list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.9.3" ) # Commands beyond this point should not need to know the version. set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake index 9497c033..cfbccf3a 100644 --- a/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.9.2") +set(PACKAGE_VERSION "2.9.3") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.9.2" MATCHES "^([0-9]+)\\.") + if("2.9.3" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "2.9.2") + set(CVF_VERSION_MAJOR "2.9.3") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so b/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so index 0ccf4971..6cd07848 100644 Binary files a/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so and b/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so differ diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 index 19f11db1..07122dbb 120000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 +++ b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 @@ -1 +1 @@ -libOrbbecSDK.so.2.9.2 \ No newline at end of file +libOrbbecSDK.so.2.9.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.2 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.3 similarity index 87% rename from orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.2 rename to orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.3 index af92a10c..fc3deb08 100644 Binary files a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.2 and b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.9.3 differ diff --git a/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml b/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml index 41c12064..120717b8 100644 --- a/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml +++ b/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml @@ -2028,8 +2028,8 @@ - false - true + true + false