Skip to content

Commit eaed477

Browse files
authored
chore: Version bump for c2pa-rs (#93)
* fix: Examples * fix: Clean up * fix: Tests * fix: Add some streaming tests * fix: Some more reader tests * fix: Code reorg * fix: Make test more granular * fix: SPlit tests * fix: DngStream * fix: DngStream * fix: Few more signing tests * fix: Ingredients use example * fix: Update * fix: Clean up * fix: Clean up 2 * fix: Bump c2pa-rs version (#94) * fix: Bump version * fix: Stream handling * fix: Bump version * fix: assert_no_throw * fix: Clean up * fix: Parameterized tests * fix: Fix comment * fix: More parameterized tests * fix: audio * fix: Video example * fix: Comments * fix: Comments * fix: Multiple resources test * fix: Reader tests * fix: Reader tests 2 * fix: Interleaving ingredients and resources * fix: Comments * fix: Bump version number * fix: Undo some automation
1 parent 137ddcc commit eaed477

10 files changed

Lines changed: 684 additions & 169 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
cmake_minimum_required(VERSION 3.27)
1515

1616
# This is the version of this C++ project
17-
project(c2pa-c VERSION 0.8.0)
17+
project(c2pa-c VERSION 0.9.0)
1818

1919
# Set the version of the c2pa_rs library used here
20-
set(C2PA_VERSION "0.58.0")
20+
set(C2PA_VERSION "0.61.0")
2121

2222
set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
2323
set(CMAKE_C_STANDARD 17)

examples/demo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int main()
8989

9090
reader.get_resource(identifer, thumbnail_path);
9191

92-
cout << "thumbnail written to" << thumbnail_path << endl;
92+
cout << "thumbnail written to " << thumbnail_path << endl;
9393
}
9494
}
9595
catch (c2pa::C2paException const &e)

examples/training.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ int main()
114114
}
115115
catch (runtime_error const &e)
116116
{
117-
cout << "setup error" << e.what() << endl;
117+
cout << "setup error: " << e.what() << endl;
118118
}
119119
catch (json::parse_error const &e)
120120
{

tests/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function(setup_c2pa_runtime_deps target_name)
1919
COMMAND ${CMAKE_COMMAND} -E echo "Copied ${C2PA_C_LIB} to $<TARGET_FILE_DIR:${target_name}>"
2020
COMMENT "Copying c2pa_c library to ${target_name} directory"
2121
)
22-
22+
2323
# On Windows, copy all DLLs from the prebuilt lib directory
2424
if(WIN32)
2525
add_custom_command(TARGET ${target_name} POST_BUILD
@@ -36,7 +36,7 @@ function(setup_c2pa_runtime_deps target_name)
3636
)
3737
endif()
3838
endif()
39-
39+
4040
# On Linux, set RPATH to look in the executable's directory
4141
if(UNIX AND NOT APPLE)
4242
set_target_properties(${target_name} PROPERTIES
@@ -51,7 +51,7 @@ function(setup_c2pa_runtime_deps target_name)
5151
set_property(TARGET ${target_name} PROPERTY BUILD_RPATH "$ORIGIN")
5252
set_property(TARGET ${target_name} PROPERTY INSTALL_RPATH "$ORIGIN")
5353
endif()
54-
54+
5555
# On macOS, override the RPATH to remove hardcoded paths
5656
if(APPLE)
5757
set_target_properties(${target_name} PROPERTIES
@@ -76,10 +76,10 @@ include(GoogleTest)
7676

7777
# Add debug commands to check what's happening on Linux
7878
if(UNIX AND NOT APPLE)
79-
add_test(NAME debug_rpath_info
79+
add_test(NAME debug_rpath_info
8080
COMMAND bash -c "echo '=== RPATH Debug Info ===' && echo 'Working dir:' && pwd && echo 'Library files in tests dir:' && ls -la ${CMAKE_BINARY_DIR}/tests/ && echo 'RPATH of c2pa_c_tests:' && readelf -d ${CMAKE_BINARY_DIR}/tests/c2pa_c_tests | grep -E '(RPATH|RUNPATH)' && echo 'RPATH of ctest:' && readelf -d ${CMAKE_BINARY_DIR}/tests/ctest | grep -E '(RPATH|RUNPATH)' && echo 'ldd output for c2pa_c_tests:' && ldd ${CMAKE_BINARY_DIR}/tests/c2pa_c_tests"
8181
)
82-
82+
8383
add_test(NAME debug_library_location
8484
COMMAND bash -c "echo '=== Library Location Debug ===' && echo 'Current dir:' && pwd && echo 'Contents of build/debug:' && ls -la ${CMAKE_BINARY_DIR}/ && echo 'Contents of _deps:' && ls -la ${CMAKE_BINARY_DIR}/_deps/ && echo 'Contents of prebuilt lib:' && ls -la ${CMAKE_BINARY_DIR}/_deps/c2pa_prebuilt-src/lib/ && echo 'Does the relative path exist from tests dir?' && ls -la ${CMAKE_BINARY_DIR}/tests/../_deps/c2pa_prebuilt-src/lib/"
8585
)
@@ -110,19 +110,19 @@ add_executable(ctest test.c)
110110
if(WIN32)
111111
# On Windows, link to the import library (.lib file)
112112
target_link_libraries(ctest PRIVATE "${C2PA_PREBUILT_INCLUDE_DIR}/../lib/c2pa_c.dll.lib")
113-
113+
114114
# Add MSVC-specific compile options for C code to handle prebuilt library issues
115115
if(MSVC)
116116
# The prebuilt library has empty structs which are invalid in C but valid in C++
117117
# Compile as C++ to work around this prebuilt library limitation
118-
set_target_properties(ctest PROPERTIES
118+
set_target_properties(ctest PROPERTIES
119119
COMPILE_OPTIONS "/TP" # Force compile as C++
120120
CXX_STANDARD 20 # Use C++20 for designated initializers
121121
CXX_STANDARD_REQUIRED ON
122122
)
123123
target_compile_options(ctest PRIVATE
124124
/wd4996 # Disable deprecated function warnings (strerror, strncpy, etc.)
125-
/wd4244 # Disable type conversion warnings
125+
/wd4244 # Disable type conversion warnings
126126
/wd4267 # Disable size_t conversion warnings
127127
)
128128
endif()

0 commit comments

Comments
 (0)