Skip to content

Commit acea384

Browse files
gabimegabime
authored
Version 0.40.10 (#169)
* Version 0.40.10 * Updated release notes * Added updated release notes
1 parent 2cb30b9 commit acea384

33 files changed

+546
-614
lines changed

‎CMakeLists.txt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,15 @@ option(RSID_DOXYGEN "Build doxygen docs" OFF)
7272
option(RSID_SECURE "Enable secure communication with device" OFF)
7373
option(RSID_TOOLS "Build additional tools" ON)
7474
option(RSID_PY "Build python wrapper" OFF)
75-
75+
option(RSID_NETWORK "Enable networking. Required for license and update checker." ON)
7676

7777
# install option
7878
option(RSID_INSTALL "Generate the install target and rsidConfig.cmake" OFF)
7979

80+
if(RSID_NETWORK)
81+
add_compile_definitions(RSID_NETWORK)
82+
endif()
83+
8084
if(RSID_TIDY)
8185
set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
8286
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -96,13 +100,16 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${LIBS_OUTPUT_PATH}")
96100
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${LIBS_OUTPUT_PATH}")
97101
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
98102

99-
include(cmake/libcurl.cmake)
100-
include(cmake/restClient.cmake)
101-
include(cmake/nlohmann-json.cmake)
102-
include(cmake/base64_hpp.cmake)
103+
if(RSID_NETWORK)
104+
include(cmake/libcurl.cmake)
105+
include(cmake/restClient.cmake)
106+
include(cmake/nlohmann-json.cmake)
107+
include(cmake/base64_hpp.cmake)
108+
endif()
109+
103110
include(cmake/OS.cmake)
104111
include(cmake/SpdLog.cmake)
105-
if(MSVC)
112+
if(MSVC AND RSID_NETWORK)
106113
include(cmake/winreg.cmake)
107114
endif()
108115

‎Readme.md‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,25 @@ $ make -j
4545

4646
The following possible options are available for the `cmake` command
4747

48-
| Option | Default | Feature |
49-
|----------------------|:-------:|:-------------------------------------------------|
50-
| `RSID_DEBUG_CONSOLE` | `ON` | Log everything to console |
51-
| `RSID_DEBUG_FILE` | `OFF` | Log everything to _rsid_debug.log_ file |
52-
| `RSID_DEBUG_SERIAL` | `OFF` | Log all serial communication |
53-
| `RSID_DEBUG_PACKETS` | `OFF` | Log packet sent/received over the serial line |
54-
| `RSID_DEBUG_VALUES` | `OFF` | Replace default common values with debug ones |
55-
| `RSID_PREVIEW` | `OFF` | Enables preview feature. |
56-
| `RSID_SAMPLES` | `OFF` | Build samples |
57-
| `RSID_TIDY` | `OFF` | Enable clang-tidy |
58-
| `RSID_PEDANTIC` | `OFF` | Enable extra compiler warnings |
59-
| `RSID_PROTECT_STACK` | `OFF` | Enable stack protection compiler flags |
60-
| `RSID_DOXYGEN` | `OFF` | Build doxygen docs |
61-
| `RSID_SECURE` | `OFF` | Enable secure communication with device |
62-
| `RSID_TOOLS` | `ON` | Build additional tools |
63-
| `RSID_PY` | `OFF` | Build python wrapper |
64-
| `RSID_INSTALL` | `OFF` | Generate the install target and rsidConfig.cmake |
48+
| Option | Default | Feature |
49+
|----------------------|:-------:|:-----------------------------------------------------------|
50+
| `RSID_DEBUG_CONSOLE` | `ON` | Log everything to console |
51+
| `RSID_DEBUG_FILE` | `OFF` | Log everything to _rsid_debug.log_ file |
52+
| `RSID_DEBUG_SERIAL` | `OFF` | Log all serial communication |
53+
| `RSID_DEBUG_PACKETS` | `OFF` | Log packet sent/received over the serial line |
54+
| `RSID_DEBUG_VALUES` | `OFF` | Replace default common values with debug ones |
55+
| `RSID_PREVIEW` | `OFF` | Enables preview feature. |
56+
| `RSID_SAMPLES` | `OFF` | Build samples |
57+
| `RSID_TIDY` | `OFF` | Enable clang-tidy |
58+
| `RSID_PEDANTIC` | `OFF` | Enable extra compiler warnings |
59+
| `RSID_PROTECT_STACK` | `OFF` | Enable stack protection compiler flags |
60+
| `RSID_DOXYGEN` | `OFF` | Build doxygen docs |
61+
| `RSID_SECURE` | `OFF` | Enable secure communication with device |
62+
| `RSID_TOOLS` | `ON` | Build additional tools |
63+
| `RSID_PY` | `OFF` | Build python wrapper |
64+
| `RSID_INSTALL` | `OFF` | Generate the install target and rsidConfig.cmake |
65+
| `RSID_NETWORK` | `ON` | Enable networking. Required for license and update checker.|
66+
6567

6668
### Linux Post Install
6769

@@ -375,17 +377,7 @@ struct RSID_API DeviceConfig
375377
SpoofOnly = 2, // spoof only
376378
RecognitionOnly = 3 // recognition only
377379
};
378-
379-
/**
380-
* @enum FaceSelectionPolicy
381-
* @brief To run authentication on all (up to 5) detected faces vs single (closest) face
382-
*/
383-
enum class FaceSelectionPolicy
384-
{
385-
Single = 0, // default, run authentication on closest face
386-
All = 1 // run authentication on all (up to 5) detected faces
387-
};
388-
380+
389381
enum class DumpMode
390382
{
391383
None = 0,
@@ -395,8 +387,7 @@ struct RSID_API DeviceConfig
395387

396388
CameraRotation camera_rotation = CameraRotation::Rotation_0_Deg;
397389
SecurityLevel security_level = SecurityLevel::Medium;
398-
AlgoFlow algo_flow = AlgoFlow::All;
399-
FaceSelectionPolicy face_selection_policy = FaceSelectionPolicy::Single;
390+
AlgoFlow algo_flow = AlgoFlow::All;
400391
DumpMode dump_mode = DumpMode::None;
401392
};
402393
```

‎include/RealSenseID/AuthenticateStatus.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ enum class RSID_API AuthenticateStatus
3434
TooManySpoofs,
3535
InvalidFeatures,
3636
AmbiguiousFace,
37+
/// Accessories
38+
Sunglasses = 50,
3739
/// serial statuses
3840
Ok = 100,
3941
Error,
@@ -43,13 +45,15 @@ enum class RSID_API AuthenticateStatus
4345
CrcError,
4446
LicenseError,
4547
LicenseCheck,
46-
///
48+
/// Spoofs
4749
Spoof_2D = 120,
4850
Spoof_3D,
4951
Spoof_LR,
5052
Spoof_Disparity,
5153
Spoof_Surface,
52-
Spoof_Plane_Disparity
54+
Spoof_Plane_Disparity,
55+
Spoof_2D_Right,
56+
/* Note: Should not exceed 127 - to be a legal ascii*/
5357
};
5458

5559
/**

‎include/RealSenseID/DeviceConfig.h‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,7 @@ struct RSID_API DeviceConfig
4444
RecognitionOnly = 3 // recognition only
4545
};
4646

47-
/**
48-
* @enum FaceSelectionPolicy
49-
* @brief Controls whether to run authentication on all (up to 5) detected faces vs single (closest) face
50-
*/
51-
enum class FaceSelectionPolicy
52-
{
53-
Single = 0, // default, run authentication on closest face
54-
All = 1 // run authentication on all (up to 5) detected faces
55-
};
56-
47+
5748
enum class DumpMode
5849
{
5950
None = 0, // default
@@ -79,7 +70,6 @@ struct RSID_API DeviceConfig
7970
CameraRotation camera_rotation = CameraRotation::Rotation_0_Deg;
8071
SecurityLevel security_level = SecurityLevel::Low;
8172
AlgoFlow algo_flow = AlgoFlow::FaceDetectionOnly;
82-
FaceSelectionPolicy face_selection_policy = FaceSelectionPolicy::Single;
8373
DumpMode dump_mode = DumpMode::None;
8474
MatcherConfidenceLevel matcher_confidence_level = MatcherConfidenceLevel::Low;
8575

@@ -98,7 +88,6 @@ struct RSID_API DeviceConfig
9888
RSID_API const char* Description(DeviceConfig::CameraRotation rotation);
9989
RSID_API const char* Description(DeviceConfig::SecurityLevel level);
10090
RSID_API const char* Description(DeviceConfig::AlgoFlow algoMode);
101-
RSID_API const char* Description(DeviceConfig::FaceSelectionPolicy policy);
10291
RSID_API const char* Description(DeviceConfig::DumpMode dump_mode);
10392
RSID_API const char* Description(DeviceConfig::MatcherConfidenceLevel matcher_confidence_level);
10493

@@ -123,12 +112,6 @@ inline OStream& operator<<(OStream& os, const DeviceConfig::SecurityLevel& level
123112
return os;
124113
}
125114

126-
template <typename OStream>
127-
inline OStream& operator<<(OStream& os, const DeviceConfig::FaceSelectionPolicy& policy)
128-
{
129-
os << Description(policy);
130-
return os;
131-
}
132115

133116
template <typename OStream>
134117
inline OStream& operator<<(OStream& os, const DeviceConfig::DumpMode& dump_mode)

‎include/RealSenseID/EnrollStatus.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ enum class RSID_API EnrollStatus
3434
Spoof,
3535
InvalidFeatures,
3636
AmbiguiousFace,
37+
/// Accessories
38+
Sunglasses = 50,
3739
/// serial statuses
3840
Ok = 100,
3941
Error,
@@ -43,13 +45,14 @@ enum class RSID_API EnrollStatus
4345
CrcError,
4446
LicenseError,
4547
LicenseCheck,
46-
///
48+
/// Spoofs
4749
Spoof_2D = 120,
4850
Spoof_3D,
4951
Spoof_LR,
5052
Spoof_Disparity,
5153
Spoof_Surface,
52-
Spoof_Plane_Disparity
54+
Spoof_Plane_Disparity,
55+
Spoof_2D_Right
5356
};
5457

5558
/**

‎include/RealSenseID/UpdateChecker.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ struct RSID_API ReleaseInfo {
2222
const char* fw_version_str = nullptr;
2323
const char* release_url = nullptr;
2424
const char* release_notes_url = nullptr;
25-
~ReleaseInfo();
25+
26+
~ReleaseInfo() {
27+
delete[] sw_version_str;
28+
delete[] fw_version_str;
29+
delete[] release_url;
30+
delete[] release_notes_url;
31+
}
2632
};
2733

2834
class RSID_API UpdateChecker

‎include/RealSenseID/Version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#define RSID_VER_MAJOR 0
1111
#define RSID_VER_MINOR 40
12-
#define RSID_VER_PATCH 0
12+
#define RSID_VER_PATCH 10
1313

1414
#define RSID_VERSION (RSID_VER_MAJOR * 10000 + RSID_VER_MINOR * 100 + RSID_VER_PATCH)
1515

@@ -36,4 +36,4 @@ RSID_API const char* CompatibleFirmwareVersion();
3636
*/
3737
RSID_API bool IsFwCompatibleWithHost(const std::string& fw_version);
3838

39-
} // namespace RealSenseID
39+
} // namespace RealSenseID

‎release_info.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"sw_version": 4000,
3-
"sw_version_str": "0.40.0",
4-
"fw_version": 700000304,
5-
"fw_version_str": "7.0.0.304",
6-
"release_url": "https://github.com/IntelRealSense/RealSenseID/releases/tag/v0.40.0",
7-
"release_notes_url": "https://github.com/IntelRealSense/RealSenseID/blob/v0.40.0/release_notes.txt"
2+
"sw_version": 4010,
3+
"sw_version_str": "0.40.10",
4+
"fw_version": 705000303,
5+
"fw_version_str": "7.5.0.303",
6+
"release_url": "https://github.com/IntelRealSense/RealSenseID/releases/tag/v0.40.10",
7+
"release_notes_url": "https://github.com/IntelRealSense/RealSenseID/blob/v0.40.10/release_notes.txt"
88
}

‎release_notes.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Realsense ID version 0.40.10
2+
-----------------------------------
3+
**Important:** To retain the device database, export it before upgrading. You can import it back after the upgrade using rsid-viewer
4+
* New firmware release - version 7.5.0.303
5+
* Improved TPR for Anti-Spoofing
6+
* Increased database limit to 1,000 users.
7+
* Added anti spoofing limitations to enrollment
8+
* Added standby mode for lower power consumption
9+
* New host SW:
10+
* Improved support for device databases with 1,000 users
11+
* Added CMake option to compile without network support (`-DRSID_NETWORK=OFF`)
12+
* Added Set/Get color gains to python API
13+
* Removed support for multi-face authentication
14+
15+
116
Realsense ID version 0.40.0
217
-----------------------------------
318
* New firmware release - version 7.0.0.304

‎samples/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,5 @@ if (RSID_PREVIEW)
3232
# snapshot preview
3333
add_executable(preview-snapshot-cpp-sample preview_snapshot.cc)
3434
target_link_libraries(preview-snapshot-cpp-sample PRIVATE rsid)
35-
set_target_properties(preview-snapshot-cpp-sample PROPERTIES FOLDER "samples/cpp")
36-
37-
# face-rects
38-
add_executable(multi-faces-cpp-sample multi-faces.cc)
39-
target_link_libraries(multi-faces-cpp-sample PRIVATE rsid)
40-
set_target_properties(multi-faces-cpp-sample PROPERTIES FOLDER "samples/cpp")
35+
set_target_properties(preview-snapshot-cpp-sample PROPERTIES FOLDER "samples/cpp")
4136
endif()

0 commit comments

Comments
 (0)