Skip to content

Commit

Permalink
CODA-OSS 2024-03-18 and NITRO-2.11.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith committed Mar 18, 2024
1 parent 84c8ba6 commit 193c4f0
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 8 deletions.
2 changes: 1 addition & 1 deletion externals/coda-oss/.github/workflows/build_unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
- name: configure
run: |
mkdir out && cd out
cmake .. -DENABLE_PYTHON=OFF -DENABLE_ASAN=ON -DENABLE_${{ matrix.avx }}=ON
cmake .. -DENABLE_PYTHON=OFF -DENABLE_${{ matrix.avx }}=ON
- name: build
run: |
cd out
Expand Down
8 changes: 7 additions & 1 deletion externals/coda-oss/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# coda-oss Release Notes

## [Release 202?-??-??](https://github.com/mdaus/coda-oss/releases/tag/202?-??-??)
## [Release 2024-03-18](https://github.com/mdaus/coda-oss/releases/tag/2024-03-18)
* Update to [HighFive 2.8.0](https://github.com/BlueBrain/HighFive/releases/tag/v2.8.0).
* Use lookup tables for converting between character encodings and upper/lower-case.
* [`sys::Transform(std::execution)`](https://en.cppreference.com/w/cpp/algorithm/execution_policy_tag_t) for C++14.
* Infrastructure to support SIMD processing.
* Simple/incomplete [`std::mdspan`](https://en.cppreference.com/w/cpp/container/mdspan) implementation.
* Support for building as a shared library/DLL, disabled by default.
* Create/destroy Xerces just once per process.

## [Release 2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23)
* Tweaked **.gitattributes**.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ static_assert(CODA_OSS_MAKE_VERSION_MMPB(9999, 9999, 9999, 9999) <= UINT64_MAX,

// Do this ala C++ ... we don't currently have major/minor/patch
//#define CODA_OSS_VERSION_ 20210910L // c.f. __cplusplus
#define CODA_OSS_VERSION_ 2023 ## 0010 ## 0023 ## 0000 ## L
#define CODA_OSS_VERSION_ 2024 ## 0003 ## 0018 ## 0000 ## L

// Use the same macros other projects might want to use; overkill for us.
#define CODA_OSS_VERSION_MAJOR 2023
#define CODA_OSS_VERSION_MINOR 10
#define CODA_OSS_VERSION_PATCH 23 // a.k.a. "point," but too similar to "patch."
#define CODA_OSS_VERSION_MAJOR 2024
#define CODA_OSS_VERSION_MINOR 3
#define CODA_OSS_VERSION_PATCH 18 // a.k.a. "point," but too similar to "patch."
#define CODA_OSS_VERSION_BUILD 0 // a.k.a. "patch," but too similar to "point."
#define CODA_OSS_VERSION CODA_OSS_MAKE_VERSION_MMPB(CODA_OSS_VERSION_MAJOR, CODA_OSS_VERSION_MINOR, CODA_OSS_VERSION_PATCH, CODA_OSS_VERSION_BUILD)

Expand Down
6 changes: 6 additions & 0 deletions externals/nitro/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# NITRO (NITF i/o) Release Notes

## [Version 2.11.6](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.6); March 18, 2024
* [coda-oss](https://github.com/mdaus/coda-oss) release [2024-03-18](https://github.com/mdaus/coda-oss/releases/tag/2024-03-18)
* TREs can now be statically ["pre-loaded"](https://github.com/mdaus/nitro/pull/601), no need to set NITF_PLUGIN_PATH.
* Be sure TRE field padding is done properly.
* Allow shared-libraries (DLLs) to be build; disabled by default.

## [Version 2.11.5](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.5); October 23, 2023
* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23)
* Fix some ASAN diagnostics, still more to do.
Expand Down
1 change: 1 addition & 0 deletions externals/nitro/UnitTest/UnitTest.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<ConformanceMode>true</ConformanceMode>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down
3 changes: 2 additions & 1 deletion externals/nitro/modules/c++/nitf/include/nitf/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
// 2.11.3 June 5, 2023
// 2.11.4 August 18, 2023
// 2.11.5 October 23, 2023
// 2.11.6 March 18, 2024
#define NITF_VERSION_MAJOR 2
#define NITF_VERSION_MINOR 11
#define NITF_VERSION_PATCH 5 // a.k.a. "point," but too similar to "patch."
#define NITF_VERSION_PATCH 6 // a.k.a. "point," but too similar to "patch."
#define NITF_VERSION_BUILD 0 // a.k.a. "patch," but too similar to "point."
#define NITF_VERSION CODA_OSS_MAKE_VERSION_MMPB(NITF_VERSION_MAJOR, NITF_VERSION_MINOR, NITF_VERSION_PATCH, NITF_VERSION_BUILD)

Expand Down
1 change: 1 addition & 0 deletions externals/nitro/modules/c/j2k/J2KCompress.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<SubSystem>
Expand Down
1 change: 1 addition & 0 deletions externals/nitro/modules/c/j2k/J2KDecompress.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<SubSystem>
Expand Down
1 change: 1 addition & 0 deletions externals/nitro/modules/c/nitf/TEST_DES.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<ControlFlowGuard>Guard</ControlFlowGuard>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<Link>
<SubSystem>
Expand Down
2 changes: 1 addition & 1 deletion externals/nitro/modules/c/nrt/include/nrt/Version.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once

#if !defined(NRT_LIB_VERSION)
#define NRT_LIB_VERSION "2.11.5"
#define NRT_LIB_VERSION "2.11.6"
#endif

0 comments on commit 193c4f0

Please sign in to comment.