Skip to content

Commit

Permalink
Bump version to 1.1.2
Browse files Browse the repository at this point in the history
Update version to 1.1.2.
Note: Does not strictly follow the rules of SemVer

Test: Build
  • Loading branch information
ram-mohan committed Sep 19, 2024
1 parent 42c693d commit e76bd1c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if(POLICY CMP0091)
cmake_policy(SET CMP0091 OLD)
endif()

project(libuhdr VERSION 1.1.1 LANGUAGES C CXX
project(libuhdr VERSION 1.1.2 LANGUAGES C CXX
DESCRIPTION "Library for encoding and decoding ultrahdr images")

###########################################################
Expand Down
1 change: 1 addition & 0 deletions docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Following is a list of available options:
| `UHDR_ENABLE_INSTALL` | ON | Enable install and uninstall targets for libuhdr package. <ul><li> For system wide installation it is best if dependencies are acquired from OS package manager instead of building from source. This is to avoid conflicts with software that is using a different version of the said dependency and also links to libuhdr. So if `UHDR_BUILD_DEPS` is **ON** then `UHDR_ENABLE_INSTALL` is forced to **OFF** internally. |
| `UHDR_ENABLE_INTRINSICS` | ON | Build with SIMD acceleration. Sections of libuhdr are accelerated for Arm Neon architectures and these are enabled. <ul><li> For x86/x86_64 architectures currently no SIMD acceleration is present. Consequently this option has no effect. </li><li> This parameter has no effect no SIMD configuration settings of dependencies. </li></ul> |
| `UHDR_ENABLE_GLES` | OFF | Build with GPU acceleration. |
| `UHDR_MAX_DIMENSION` | 8192 | Maximum dimension supported by the library. The library defaults to handling images upto resolution 8192x8192. For different resolution needs use this option. For example, `-DUHDR_MAX_DIMENSION=4096`. |
| `UHDR_BUILD_JAVA` | OFF | Build JNI wrapper, Java front-end classes and Java sample application. |
| `UHDR_SANITIZE_OPTIONS` | OFF | Build library with sanitize options. Values set to this parameter are passed to directly to compilation option `-fsanitize`. For example, `-DUHDR_SANITIZE_OPTIONS=address,undefined` adds `-fsanitize=address,undefined` to the list of compilation options. CMake configuration errors are raised if the compiler does not support these flags. This is useful during fuzz testing. <ul><li> As `-fsanitize` is an instrumentation option, dependencies are also built from source instead of using pre-builts. This is done by forcing `UHDR_BUILD_DEPS` to **ON** internally. </li></ul> |
| | | |
Expand Down
2 changes: 1 addition & 1 deletion lib/src/jpegencoderhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ uhdr_error_info_t JpegEncoderHelper::encode(const uint8_t* planes[3], const size
char comment[255];
snprintf(comment, sizeof comment,
"Source: google libuhdr v%s, Coder: libjpeg v%d, Attrib: GainMap Image",
UHDR_LIB_VERSION, JPEG_LIB_VERSION);
UHDR_LIB_VER_STR, JPEG_LIB_VERSION);
jpeg_write_marker(&cinfo, JPEG_COM, reinterpret_cast<JOCTET*>(comment), strlen(comment));
}
if (format == UHDR_IMG_FMT_24bppRGB888) {
Expand Down
15 changes: 14 additions & 1 deletion ultrahdr_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,22 @@
* string. Some bug fixes and introduced one new API
* which warrants a minor version update. But
* indicated as a patch update.
* 1.1.2 1.1.2 Some bug fixes, introduced new API and renamed
* existing API which warrants a major version update.
* But indicated as a patch update.
*/

// This needs to be kept in sync with version in CMakeLists.txt
#define UHDR_LIB_VERSION "1.1.1"
#define UHDR_LIB_VER_MAJOR 1
#define UHDR_LIB_VER_MINOR 1
#define UHDR_LIB_VER_PATCH 2

#define UHDR_LIB_VERS (((UHDR_LIB_VER_MAJOR * 10000) + (UHDR_LIB_VER_MINOR * 100) + UHDR_LIB_VER_PATCH)

#define XSTR(s) STR(s)
#define STR(s) #s
#define UHDR_LIB_VER_STR \
XSTR(UHDR_LIB_VER_MAJOR) "." XSTR(UHDR_LIB_VER_MINOR) "." XSTR(UHDR_LIB_VER_PATCH)

// ===============================================================================================
// Enum Definitions
Expand Down

0 comments on commit e76bd1c

Please sign in to comment.