Skip to content

Commit 35c1c1e

Browse files
committed
chore: prepare v1.6.0 release
1 parent 9171c25 commit 35c1c1e

9 files changed

Lines changed: 18 additions & 17 deletions

File tree

BUILD_AND_INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,6 @@ git clean -fdx install/
252252

253253
## Version Information
254254

255-
Current version: 1.5.1
255+
Current version: 1.6.0
256256

257257
This is the first official release of the ccap project, including complete CMake configuration and cross-platform build support.

bindings/rust/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ccap-rs"
3-
version = "1.5.1"
3+
version = "1.6.0"
44
edition = "2021"
55
rust-version = "1.65"
66
authors = ["wysaid <this@wysaid.org>"]

ccap.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ccap"
3-
s.version = "1.5.1"
3+
s.version = "1.6.0"
44
s.summary = "CameraCapture And Player"
55
s.description = <<-DESC
66
Pod of https://github.com/wysaid/CameraCapture

examples/desktop/utils/helper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
#include <ccap.h>
66
#include <cctype>
7+
#include <climits>
78
#include <cstdio>
89
#include <cstdlib>
910
#include <cstring>
10-
#include <climits>
1111
#include <filesystem>
1212
#include <string>
1313
#include <vector>

examples/desktop/utils/helper.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ extern "C" {
1414
#endif
1515

1616
typedef enum ExampleCameraBackend {
17-
EXAMPLE_CAMERA_BACKEND_UNSPECIFIED = 0,
18-
EXAMPLE_CAMERA_BACKEND_AUTO,
19-
EXAMPLE_CAMERA_BACKEND_MSMF,
20-
EXAMPLE_CAMERA_BACKEND_DSHOW,
17+
EXAMPLE_CAMERA_BACKEND_UNSPECIFIED = 0,
18+
EXAMPLE_CAMERA_BACKEND_AUTO,
19+
EXAMPLE_CAMERA_BACKEND_MSMF,
20+
EXAMPLE_CAMERA_BACKEND_DSHOW,
2121
} ExampleCameraBackend;
2222

2323
typedef struct ExampleCommandLine {
24-
int argc;
25-
char** argv;
26-
ExampleCameraBackend cameraBackend;
24+
int argc;
25+
char** argv;
26+
ExampleCameraBackend cameraBackend;
2727
} ExampleCommandLine;
2828

2929
void initExampleCommandLine(ExampleCommandLine* commandLine, int argc, char** argv);

include/ccap_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
/* ========== Version Information ========== */
1616

1717
#define CCAP_VERSION_MAJOR 1
18-
#define CCAP_VERSION_MINOR 5
19-
#define CCAP_VERSION_PATCH 1
20-
#define CCAP_VERSION_STRING "1.5.1"
18+
#define CCAP_VERSION_MINOR 6
19+
#define CCAP_VERSION_PATCH 0
20+
#define CCAP_VERSION_STRING "1.6.0"
2121

2222
/* ========== Export/Import Macro Definitions ========== */
2323

scripts/update_version.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ patterns = [
111111
new_text = text
112112
count = 0
113113
for pattern in patterns:
114-
new_text, n = re.subn(pattern, rf"\1{new_ver}\2", new_text, count=1)
114+
replacement = lambda match: f"{match.group(1)}{new_ver}{match.group(2)}"
115+
new_text, n = re.subn(pattern, replacement, new_text, count=1)
115116
if n:
116117
count += n
117118
break

src/ccap_imp_windows_msmf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ bool ProviderMSMF::configureMediaType() {
536536
}
537537

538538
PixelFormat preferredPixelFormat = m_frameProp.cameraPixelFormat != PixelFormat::Unknown ? m_frameProp.cameraPixelFormat :
539-
m_frameProp.outputPixelFormat;
539+
m_frameProp.outputPixelFormat;
540540

541541
const MediaTypeInfo* selected = nullptr;
542542
for (size_t index : bestIndexes) {

0 commit comments

Comments
 (0)