Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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 linux
  • Loading branch information
daiyin committed Sep 21, 2023
commit c032215a057abba4c2caabc9be42d751f09008e3
16 changes: 16 additions & 0 deletions include/k4a/k4aversion.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. */

#ifndef K4AVERSION_H
#define K4AVERSION_H

#define K4A_VERSION_MAJOR 1
#define K4A_VERSION_MINOR 4
#define K4A_VERSION_PATCH 0
#define K4A_VERSION_PRERELEASE "private"
#define K4A_VERSION_BUILD_METADATA ""

#define K4A_VERSION_STR "1.4.0-private"

#endif

5 changes: 5 additions & 0 deletions src/orbbec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ configure_file(
"${CMAKE_CURRENT_BINARY_DIR}/include/k4a/k4aversion.h"
)

configure_file(
"${K4A_INCLUDE_DIR}/k4a/k4aversion.h.in"
"${K4A_INCLUDE_DIR}/k4a/k4aversion.h"
)

# Include ${CMAKE_CURRENT_BINARY_DIR}/version.rc in the target's sources
# to embed version information
set(K4A_FILEDESCRIPTION "Azure Kinect SDK")
Expand Down
3 changes: 3 additions & 0 deletions tests/UnitTests/utcommon/utcommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ int64_t k4a_unittest_get_max_sync_delay_ms(k4a_fps_t fps)
case K4A_FRAMES_PER_SECOND_30:
max_delay = 110;
break;
default:
return max_delay;
break;
}
return max_delay;
}
Expand Down
9 changes: 9 additions & 0 deletions tests/latency/latency_perf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ static const char *get_string_from_color_format(k4a_image_format_t format)
case K4A_IMAGE_FORMAT_CUSTOM:
return "K4A_IMAGE_FORMAT_CUSTOM";
break;
default:
return "K4A_IMAGE_FORMAT_UNKNOWN";
break;
}
assert(0);
return "K4A_IMAGE_FORMAT_UNKNOWN";
Expand Down Expand Up @@ -173,6 +176,9 @@ static const char *get_string_from_color_resolution(k4a_color_resolution_t resol
case K4A_COLOR_RESOLUTION_3072P:
return "4096 * 3072 4:3";
break;
default:
return "Unknown resolution";
break;
}
assert(0);
return "Unknown resolution";
Expand Down Expand Up @@ -200,6 +206,9 @@ static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
case K4A_DEPTH_MODE_PASSIVE_IR:
return "K4A_DEPTH_MODE_PASSIVE_IR";
break;
default:
return "Unknown Depth";
break;
}
assert(0);
return "Unknown Depth";
Expand Down
9 changes: 9 additions & 0 deletions tests/throughput/throughput_perf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ static const char *get_string_from_color_format(k4a_image_format_t format)
case K4A_IMAGE_FORMAT_CUSTOM:
return "K4A_IMAGE_FORMAT_CUSTOM";
break;
default:
return "K4A_IMAGE_FORMAT_UNKNOWN";
break;
}
assert(0);
return "K4A_IMAGE_FORMAT_UNKNOWN";
Expand Down Expand Up @@ -140,6 +143,9 @@ static const char *get_string_from_color_resolution(k4a_color_resolution_t resol
case K4A_COLOR_RESOLUTION_3072P:
return "4096 * 3072 4:3";
break;
default:
return "Unknown resolution";
break;
}
assert(0);
return "Unknown resolution";
Expand Down Expand Up @@ -167,6 +173,9 @@ static const char *get_string_from_depth_mode(k4a_depth_mode_t mode)
case K4A_DEPTH_MODE_PASSIVE_IR:
return "K4A_DEPTH_MODE_PASSIVE_IR";
break;
default:
return "Unknown Depth";
break;
}
assert(0);
return "Unknown Depth";
Expand Down