Squashed 'externals/nitro/' changes from c8ecbe9ae..0357b1432

0357b1432 NITRO-2.11.5 (#589) a0ad6f943 CODA-OSS 2023-10-23 (#588) 1b631e578 latest from CODA-OSS (#587) 574bfe2b6 FmtX() -> str::Format() (#586) edfa0f7ce latest from CODA-OSS (#585) b26e15318 latest from CODA-OSS (#583) 0db9bdb29 fix ASAN diagnostics (#582) e418beceb Merge commit '6144b2cfb436a5696bab62c81651b47edf07aa8c' 6144b2cfb Squashed 'externals/coda-oss/' changes from 8dee6f7a68..c92a55d7c7 32d9c4fe4 latest from CODA-OSS 49f6338d2 latest from CODA-OSS (#581) 72cd86cbf latest from CODA-OSS (#580) e4920a743 FmtX() -> str::Format() 81ea6f178 Squashed 'externals/coda-oss/' changes from e87c32b4de..8dee6f7a68 e488297c3 Merge commit '81ea6f1789863f26f06dc447f7784383dc7cb595' 72209535d toString() changes from CODA-OSS (#579) fc1f59799 latest from CODA-OSS (#578) 02e8f80c6 latest from CODA-OSS (#577) e7ea728ec reduce differences between cpp17 and main branches (#576) 547d0aa9f NITRO-2.11.4 (#575) fe309c4ba Merge branch 'main' of github.com:mdaus/nitro 10efa9990 latest from CODA-OSS (#574) d08f1c0a1 CRLF db5d3d484 latest from CODA-OSS 98c755048 CRLF aa1482543 CRLF bfdbe69a4 Latest from CODA-OSS (#573) 9e4ce0b58 latest from CODA-OSS (#572) 227a8a8f4 trust coda-oss for right -std flags 13869687e latest from CODA-OSS (#571) 5724d8c18 latest from CODA-OSS (#570) fb794f0fe latest from CODA-OSS (#569) 7a6132ba0 update files changes in cpp17 branch (#568) de91d4977 Fix bug creating NITFException (#567) 225273436 fix YAML for 'main' 5d1c83d11 single project for unittests (#566) 102a019db latest from CODA-OSS (known broken build) (#565) b4ae2d429 match YAML from coda-oss 176bcaf6d build NITRO.SLN using msbuild (#562) 85e9043b8 latest from CODA-OSS (#561) 49ec50325 use new "PlatformToolkit" special environment variable (#560) 6c06e3711 latest from CODA-OSS (#559) cee9feb42 latest from CODA-OSS (#558) 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 0357b143293bc7b1ce5d5d941f1a5e6564b319a9
ngageoint · Oct 23, 2023 · 0d9d64f · 0d9d64f
1 parent 99bf76e
commit 0d9d64f
Show file tree

Hide file tree

Showing 1,455 changed files with 218,431 additions and 215,168 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,96 @@ conanfile.py text eol=lf
 CMakeLists.txt text eol=lf
 *.cmake text eol=lf
 *.in text eol=lf
+
+# Modern tools on Windows can handle Linux LF
+# See https://stackoverflow.com/a/13154031/8877 for details
+*     		text=auto eol=lf
+*.*   		text=auto eol=lf
+.git?*	   	text=auto eol=lf
+
+# Leave known Windows-only text files as CR/LF
+*.sln	      	     text eol=crlf
+*.dsw	      	     text eol=crlf
+*.dsp 	     	     text eol=crlf
+*.vcproj 	     text eol=crlf
+*.vcxproj 	     text eol=crlf
+*.vcxproj.filters    text eol=crlf
+*.ruleset 	     text eol=crlf
+*.bat		     text eol=crlf
+
+######################
+# Known binary files
+
+# Python builds with WAF
+waf	 binary
+
+# executables, libraries; yes, sometimes they're part of a repository
+*.exe	       binary
+*.out	       binary
+lib*.so*       binary
+*.dll	       binary
+lib*.a*	       binary
+*.lib	       binary
+*.mex	       binary
+*.pyc	       binary
+
+# from various unit_test/ directories
+*.dat  	       binary
+*.*hdr	       binary
+*.flat	       binary
+*.sig	       binary
+*.bin	       binary
+*.dump	       binary
+
+# images
+*.bmp	binary
+*.ico	binary
+*.tiff	binary
+*.tif	binary
+*.gif	binary
+*.jpg	binary
+*.jpeg	binary
+*.png	binary
+# SVG images are XML
+*.svg	text
+*.raw	binary
+*.hei?	binary
+*.kmz	  binary
+
+# music
+*.mp3	binary
+*.m4a	binary
+*.wav	binary
+*.wma	binary
+
+# video
+*.m4v	binary
+*.avi	binary
+*.wmv	binary
+*.mkv	binary
+
+# documents
+*.pdf	  binary
+*.dvi	  binary
+*.doc	  binary
+*.docx	  binary
+*.xls	  binary
+*.xlsx	  binary
+*.ppt	  binary
+*.pptx	  binary
+
+# SAR
+*.h5	  binary
+*.sio	  binary
+*.hdr	  binary
+*.ntf	  binary
+*.nitf	  binary
+*.sidd	  binary
+*.sicd?	  binary
+
+# containers
+*.zip	  binary
+*.gz	  binary
+*.tar	  binary
+*.tgz	  binary
+*.jar	  binary
diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
@@ -4,9 +4,14 @@ on: [push]
 
 
 jobs:
-  build-windows:
-    name: Windows
-    runs-on: [windows-latest]
+  build-cmake-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Release]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -16,22 +21,70 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
+        mkdir out
+        cd out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
     - name: make
       run: |
-        cd build
-        cmake --build . --config Release -j
-        cmake --build . --config Release --target install
+        cd out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: test
       run: |
-        cd build
-        ctest -C Release --output-on-failure
+        cd out
+        ctest -C ${{ matrix.configuration }} --output-on-failure
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+
+  build-msbuild-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Debug] # Debug turns on more compiler warnings
+    name: ${{ matrix.os }}-msbuild
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure CODA-OSS
+      run: |
+        mkdir externals\coda-oss\out
+        cd externals\coda-oss\out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+    - name: make CODA-OSS
+      run: |
+        cd externals\coda-oss\out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+    #- name: vstest 
+    #  uses: microsoft/[email protected] # https://github.com/marketplace/actions/vstest-action
+    #  with:
+    #    platform: ${{ matrix.platform }}
+    #    testAssembly: UnitTest.dll
+    #    searchFolder: D:\a\nitro\nitro\x64\Debug
+    #- name: vstest 
+    #  run: |
+    #    vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
 
-  build-linux:
-    name: Linux
-    runs-on: [ubuntu-latest]
+  build-linux-cmake:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -41,16 +94,16 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
+        mkdir target-Release
+        cd target-Release
+        cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7
     - name: make
       run: |
-        cd build
+        cd target-Release
         # using the default number of threads (-j) causes G++ to crash
         cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |
-        cd build
+        cd target-Release
         ctest --output-on-failure
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,11 +6,15 @@ on:
   pull_request:
     branches: main
 
-
 jobs:
-  build-windows:
-    name: Windows
-    runs-on: [windows-latest]
+  build-cmake-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Release]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -20,22 +24,70 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
+        mkdir out
+        cd out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
     - name: make
       run: |
-        cd build
-        cmake --build . --config Release -j
-        cmake --build . --config Release --target install
+        cd out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: test
       run: |
-        cd build
-        ctest -C Release
+        cd out
+        ctest -C ${{ matrix.configuration }} --output-on-failure
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+
+  build-msbuild-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Debug] # Debug turns on more compiler warnings
+    name: ${{ matrix.os }}-msbuild
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure CODA-OSS
+      run: |
+        mkdir externals\coda-oss\out
+        cd externals\coda-oss\out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+    - name: make CODA-OSS
+      run: |
+        cd externals\coda-oss\out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+    #- name: vstest 
+    #  uses: microsoft/[email protected] # https://github.com/marketplace/actions/vstest-action
+    #  with:
+    #    platform: ${{ matrix.platform }}
+    #    testAssembly: UnitTest.dll
+    #    searchFolder: D:\a\nitro\nitro\x64\Debug
+    #- name: vstest 
+    #  run: |
+    #    vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
 
-  build-linux:
-    name: Linux
-    runs-on: [ubuntu-latest]
+  build-linux-cmake:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    name: ${{ matrix.os }}-CMake
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -45,18 +97,18 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
+        mkdir target-Release
+        cd target-Release
+        cmake -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7 ..
     - name: make
       run: |
-        cd build
+        cd target-Release
         # using the default number of threads (-j) causes G++ to crash
         cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |
-        cd build
-        ctest
+        cd target-Release
+        ctest --output-on-failure
 
 
diff --git a/.gitignore b/.gitignore
@@ -47,5 +47,5 @@ libnitf.pc
 cmake-build*/
 
 # unit tests
-outputPathname.ntf
-sicd_*_nitf__*_band_*.man
+outputPathname.ntf
+sicd_*_nitf__*_band_*.man
diff --git a/CHANGES b/CHANGES
@@ -1,19 +1,19 @@
-2.7 Changes
-===========
-- 12 new TREs: CSCCGA, CSCRNA, CSEPHA, CSEXRA, CSPROA, CSSFAA, CSSHPA, GRDPSB, J2KLRA, PIXQLA, SENSRB, XML_DATA_CONTENT
-- Variety of minor memory leaks, access errors, and other bug fixes
-- Fixed IOInterface and BandSource C++ API so overriding methods works as expected
-- Several complexity level bugs
-- Fixed bug in Windows involving reading and writing files larger than 4 GB
-- Build system upgrades: Among other thing, building Java bindings is now easier as it's done directly through waf automatically
-
-Please see our wiki for detailed change information on previous versions:
-
-2.5 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes25
-
-2.0 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes20
-
-1.5 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes15
-
-
-Wiki Home: http://nitro-nitf.sourceforge.net/
+2.7 Changes
+===========
+- 12 new TREs: CSCCGA, CSCRNA, CSEPHA, CSEXRA, CSPROA, CSSFAA, CSSHPA, GRDPSB, J2KLRA, PIXQLA, SENSRB, XML_DATA_CONTENT
+- Variety of minor memory leaks, access errors, and other bug fixes
+- Fixed IOInterface and BandSource C++ API so overriding methods works as expected
+- Several complexity level bugs
+- Fixed bug in Windows involving reading and writing files larger than 4 GB
+- Build system upgrades: Among other thing, building Java bindings is now easier as it's done directly through waf automatically
+
+Please see our wiki for detailed change information on previous versions:
+
+2.5 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes25
+
+2.0 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes20
+
+1.5 Changes: http://nitro-nitf.sourceforge.net/wikka.php?wakka=ReleaseNotes15
+
+
+Wiki Home: http://nitro-nitf.sourceforge.net/