Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
89ce687
update OrbbecSDK library and impl code
hzcyf Sep 18, 2023
c032215
[fix]:building in linux
Sep 21, 2023
2cb1154
[fix]:building in windows
Sep 21, 2023
7c456fb
[fix]:building problem
Sep 22, 2023
261dc22
[fix]:Adjust (k4aversion.h) generation
Sep 22, 2023
8400ec7
Delete include/k4a/k4aversion.h
zzuliys Sep 22, 2023
5c3d603
[fix]:building process in readme.md
Sep 22, 2023
47ee06a
[fix]:resolve missing enums
Sep 22, 2023
293aa69
[feat]:add obbecsdk.dll during installation
Sep 22, 2023
6387864
add Doxyfile and custom target configure to output api reference docu…
hzcyf Sep 26, 2023
660607b
Restore some unnecessary header file modifications and fix some typo
hzcyf Sep 26, 2023
69c83c4
restore cpp file and fix typo on README.md
hzcyf Sep 26, 2023
4ad8da9
Merge branch 'ob/feature/1.1.x_build_ninja' into ob/dev/bolt
Sep 26, 2023
5a37e3c
[fix]:merge
Sep 26, 2023
f1d58fd
Merge pull request #3 from zzuliys/ob/dev/bolt
hzcyf Sep 26, 2023
040abca
Update README.md
hzcyf Sep 26, 2023
1608776
checkout OrbbecSDK branch to bolt-1.7.x-dev
hzcyf Sep 26, 2023
401e289
fix k4ainternal header file include error
hzcyf Sep 26, 2023
93b726b
Modify k4aviewer code to solve the problem of failure to initialize t…
hzcyf Sep 26, 2023
5daf7e7
add attention info on README.md
hzcyf Sep 26, 2023
a5d5333
Update README.md
hzcyf Sep 26, 2023
21b7cc1
Update README.md
hzcyf Sep 26, 2023
efcc837
Update README.md
hzcyf Sep 26, 2023
29f5b10
Fix ob_k4a_impl compile errors in some versions of the compiler
hzcyf Sep 26, 2023
45e266f
add documentation link to README.md
hzcyf Sep 26, 2023
5f3f5a0
Update README.md
hzcyf Sep 26, 2023
d947d00
Update README.md
hzcyf Sep 26, 2023
114bdc4
Update README.md
hzcyf Sep 26, 2023
597db53
Update README.md
hzcyf Sep 26, 2023
da293b9
Update README.md
hzcyf Sep 26, 2023
70d6529
Update README.md
hzcyf Sep 26, 2023
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
Prev Previous commit
Next Next commit
[fix]:building in windows
  • Loading branch information
daiyin committed Sep 21, 2023
commit 2cb1154cd8c07de63571e6eceaca982dcab69d59
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ if (K4A_BUILD_DOCS)
endif()
endif()

option(K4A_VALIDATE_CLANG_FORMAT "Validate clang-format results as part of build" Yes)
option(K4A_VALIDATE_CLANG_FORMAT "Validate clang-format results as part of build" No)

set (CLANG_FORMAT_ROOT
${CMAKE_CURRENT_SOURCE_DIR}/src
Expand Down
20 changes: 15 additions & 5 deletions src/orbbec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,21 @@ get_target_property(OrbbecSDK_DLL OrbbecSDK::OrbbecSDK IMPORTED_LOCATION)
get_target_property(K4A_OUTPUT_DIR k4a RUNTIME_OUTPUT_DIRECTORY)
message(STATUS "OrbbecSDK_DLL: ${OrbbecSDK_DLL}")
message(STATUS "K4A_OUTPUT_DIR: ${K4A_OUTPUT_DIR}")
add_custom_command(TARGET k4a
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${OrbbecSDK_DLL}
${K4A_OUTPUT_DIR}/$<CONFIGURATION>)
# add_custom_command(TARGET k4a
# POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy
# ${OrbbecSDK_DLL}
# ${K4A_OUTPUT_DIR}/$<CONFIGURATION>)

execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OrbbecSDK_DLL} ${K4A_OUTPUT_DIR})

if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(DEPTHENGINE20_DLL ${CMAKE_CURRENT_LIST_DIR}/k4adepthengine/win_x64/depthengine_2_0.dll)
endif()
endif()

execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${DEPTHENGINE20_DLL} ${K4A_OUTPUT_DIR})

# Define alias for k4a
add_library(k4a::k4a ALIAS k4a)
Expand Down
8 changes: 4 additions & 4 deletions src/orbbec/ob_k4a_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,7 @@ k4a_buffer_result_t k4a_device_get_serialnum(k4a_device_t device_handle,
caller_buffer_size = *serial_number_size;

size_t snLen = strlen(sn);
*serial_number_size = snLen+1;
*serial_number_size = snLen + 1;

if (caller_buffer_size <= snLen || serial_number == NULL)
{
Expand All @@ -2051,7 +2051,7 @@ k4a_result_t version_convert(const char *orbbec_version, k4a_version_t *k4a_vers
return K4A_RESULT_FAILED;
}

size_t orbbec_version_len = strlen(orbbec_version);
size_t orbbec_version_len = (int)strlen(orbbec_version);
if (orbbec_version_len >= MAX_FIREWARE_VERSION_LEN)
{
LOG_WARNING("orbbec_version_len overflow ", 0);
Expand All @@ -2065,12 +2065,12 @@ k4a_result_t version_convert(const char *orbbec_version, k4a_version_t *k4a_vers
{
if (orbbec_version[i] >= '0' && orbbec_version[i] <= '9')
{
count = i;
count = (int)i;
break;
}
}

int split_version_len = orbbec_version_len - count;
int split_version_len = (int)orbbec_version_len - count;
memcpy(split_version, orbbec_version + count, split_version_len);

count = 0;
Expand Down
6 changes: 3 additions & 3 deletions tests/latency/latency_perf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static const char *get_string_from_color_format(k4a_image_format_t format)
break;
}
assert(0);
return "K4A_IMAGE_FORMAT_UNKNOWN";
// return "K4A_IMAGE_FORMAT_UNKNOWN";
}

static const char *get_string_from_color_resolution(k4a_color_resolution_t resolution)
Expand Down Expand Up @@ -181,7 +181,7 @@ static const char *get_string_from_color_resolution(k4a_color_resolution_t resol
break;
}
assert(0);
return "Unknown resolution";
// return "Unknown resolution";
}

static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
Expand Down Expand Up @@ -211,7 +211,7 @@ static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
break;
}
assert(0);
return "Unknown Depth";
// return "Unknown Depth";
}

static bool get_system_time(uint64_t *time_nsec)
Expand Down
6 changes: 3 additions & 3 deletions tests/throughput/throughput_perf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static const char *get_string_from_color_format(k4a_image_format_t format)
break;
}
assert(0);
return "K4A_IMAGE_FORMAT_UNKNOWN";
// return "K4A_IMAGE_FORMAT_UNKNOWN";
}

static const char *get_string_from_color_resolution(k4a_color_resolution_t resolution)
Expand Down Expand Up @@ -148,7 +148,7 @@ static const char *get_string_from_color_resolution(k4a_color_resolution_t resol
break;
}
assert(0);
return "Unknown resolution";
// return "Unknown resolution";
}

static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
Expand Down Expand Up @@ -178,7 +178,7 @@ static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
break;
}
assert(0);
return "Unknown Depth";
// return "Unknown Depth";
}

static int _throughput_imu_thread(void *param)
Expand Down