diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d73c64659f..f564eba155 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -61,8 +61,8 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v3 + - name: Autobuild + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -70,9 +70,9 @@ jobs: # If the Autobuild fails above, remove it and uncomment the following three lines. # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - run: | - echo "Run, Build Application using script" - ./0_build + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml index a7016ef91f..44916acd57 100644 --- a/.github/workflows/frequent_check.yml +++ b/.github/workflows/frequent_check.yml @@ -39,8 +39,7 @@ jobs: msbuild-architecture: x64 - name: msbuild run: | - msbuild six.sln /p:configuration=${{ matrix.configuration }} - msbuild six.sln /p:configuration=${{ matrix.configuration }} /t:Clean + msbuild nitro.sln /p:configuration=${{ matrix.configuration }} build-msbuild-windows: strategy: @@ -69,8 +68,7 @@ jobs: msbuild-architecture: x64 - name: msbuild run: | - msbuild six.sln /p:configuration=${{ matrix.configuration }} - msbuild six.sln /p:configuration=${{ matrix.configuration }} /t:Clean + msbuild nitro.sln /p:configuration=${{ matrix.configuration }} #- name: vstest # uses: microsoft/vstest-action@v1.0.0 # https://github.com/marketplace/actions/vstest-action # with: @@ -96,15 +94,16 @@ jobs: python-version: '3.7' - name: configure run: | - mkdir target - cd target - cmake -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-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 target - cmake --build . -j 8 + 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 target + cd target-Release ctest --output-on-failure diff --git a/externals/nitro/.github/workflows/main.yml b/.github/workflows/main.yml similarity index 100% rename from externals/nitro/.github/workflows/main.yml rename to .github/workflows/main.yml diff --git a/.gitignore b/.gitignore index b8babd6f1a..5d75601512 100644 --- a/.gitignore +++ b/.gitignore @@ -1,67 +1,51 @@ -*.whl -*.pyc -*~ -*.swp -*venv - -# Eclipse -.cproject -.project - -# VS Code -.vscode -packages/ -.vs -*.vcxproj.user - # Waf .lock-waf* -.waf* +.waf-* + +# CMake +out/ +_deps/ +CMakeFiles/ +CMakeCache.txt +CMakeSettings.json +# ignore build directories ... +build/ +# ... but not coda-oss/build +!/externals/coda-oss/build/ + +externals/coda-oss/modules/c++/**/Makefile +modules/**/Makefile # Build artifacts target/ -target.dbg/ install/ -install.dbg/ **/install-*/ test_package/build/ -out/build/ -out/install/ -test_package/build/ *.pyc *.swp .depproj +.vs +*.vcxproj.user **/Debug/ **/Release/ -*.a +packages/ *.so* +*.a + +# Drivers +modules/c/j2k/external/openjpeg/openjpeg-2.0.0/ +modules/c/j2k/external/jasper/jasper-1.900.1-mod/ +.DS_Store -# CMake -_deps/ -CMakeFiles/ -CMakeCache.txt -CMakeSettings.json -# cmake generates these Makefiles -externals/*/Makefile -externals/coda-oss/modules/c++/**/Makefile -externals/coda-oss/modules/python/**/Makefile -externals/nitro/modules/**/Makefile Makefile -six/Makefile -six/modules/**/Makefile -*_config.h -*_config.hpp -# ignore build directories ... -build/ -out/ -# ... but not coda-oss/build -!/externals/coda-oss/build/ +doc/build +bin/ +test/unit/CMakeScripts/ +libnitf.pc -# Drivers -six/projects/csm/external/csm-master/ +.idea/ +cmake-build*/ -# Giant test files -regression_files/ -six/modules/c++/cphd/tests/sample_cphd/ +# unit tests outputPathname.ntf - +sicd_*_nitf__*_band_*.man diff --git a/externals/nitro/.gitlab-ci.yml b/.gitlab-ci.yml similarity index 100% rename from externals/nitro/.gitlab-ci.yml rename to .gitlab-ci.yml diff --git a/externals/nitro/.regenerate_python_bindings.py b/.regenerate_python_bindings.py similarity index 100% rename from externals/nitro/.regenerate_python_bindings.py rename to .regenerate_python_bindings.py diff --git a/0_build b/0_build deleted file mode 100755 index 8f70ebe8b7..0000000000 --- a/0_build +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -f -# -# "autobuild" script for CodeQL. Maybe useful for others too. - -rm -r -f out && mkdir out && cd out -cmake -DCMAKE_INSTALL_PREFIX=install-autobuild -DENABLE_PYTHON=false .. - -cmake --build . -j 6 -exec cmake --build . --target install - - - diff --git a/externals/nitro/CHANGES b/CHANGES similarity index 100% rename from externals/nitro/CHANGES rename to CHANGES diff --git a/CMakeLists.txt b/CMakeLists.txt index 825ea882ae..6bd74b7352 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,43 +1,51 @@ cmake_minimum_required(VERSION 3.14) -project(six-library) +project(nitro) set(CMAKE_CXX_STANDARD 14) set(CXX_STANDARD_REQUIRED true) -if (${CMAKE_PROJECT_NAME} STREQUAL six-library) +if (${CMAKE_PROJECT_NAME} STREQUAL nitro) # we are the top-level project and are responsible for configuration # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output; # we'll dial-back warnings as necessary. if (MSVC) add_compile_options(/WX) # warnings as errors - add_compile_options(/MP) # multi-processor build + add_compile_options(/MP) # multi-processor compile + + if (ENABLE_ASAN) + # https://docs.microsoft.com/en-us/cpp/sanitizers/asan?view=msvc-160 + add_compile_options(/fsanitize=address) + endif() + elseif (UNIX) add_compile_options(-Werror) # warnings as errors + + if (ENABLE_ASAN) + # https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html + add_compile_options(-fsanitize=address) + add_link_options(-fsanitize=address) + endif() endif() if (EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake") - # use pre-built dependencies from conan packages + # use pre-built coda-oss from conan package include("${CMAKE_BINARY_DIR}/conan_paths.cmake") find_package(coda-oss REQUIRED) - find_package(nitro REQUIRED) include(CodaBuild) coda_initialize_build() else() - # build dependencies ourselves + # build coda-oss ourselves set(CODA_OSS_DIR "coda-oss") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/${CODA_OSS_DIR}/cmake") include(CodaBuild) coda_initialize_build() - add_subdirectory("externals") + add_subdirectory("externals/${CODA_OSS_DIR}") endif() endif() -# needed to run some unit tests from the build directory -file(COPY "croppedNitfs" - DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") - -add_subdirectory(six) +set(NITRO_C_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/c) +add_subdirectory("modules") coda_generate_package_config() diff --git a/LICENSE b/LICENSE index 341c30bda4..65c5ca88a6 100644 --- a/LICENSE +++ b/LICENSE @@ -163,4 +163,3 @@ whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - diff --git a/README.md b/README.md index 4bd132fb9b..66cda289ec 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,245 @@ -![alt tag](https://raw.github.com/ngageoint/six-library/master/docs/six_logo.png?raw=true) +Building NITRO +--------------- -## What SIX does +CMake is the preferred build method. Version 3.14 or better is required. -NGA is working to standardize Synthetic Aperture RADAR (SAR) systems in use throughout the community on a common format for complex SAR data (both wideband and narrowband metadata) as well as data derived from these data sets. By providing access through GitHub to the SIX library, the community will have access not only to the sensor-independent complex data (SICD) specification and the sensor independent derived data (SIDD) specification documents, but also a well-vetted, mature implementation of software code providing the basic functions necessary to use these formats. Additionally, the SIX library includes robust methods to validate the XML metadata in these files to provide developers and researchers with a means of testing that their files are compliant with the metadata and file format schema. By providing this support to the community, the US Government may reduce the costs incurred in reformatting SAR data to our standards and more easily benefit from a wider array of SAR data from a variety of platforms and sensors. Additionally, the SICD and SIDD standards represent value to the community because they are the result of significant research and engineering into the mechanisms necessary (and found optimal) in representing a diverse array of SAR collection and processing metadata so that processing and visualization tools can work with them appropriately. +Sample Build Scenario +--------------------- -### Origin + mkdir build + cd build + cmake .. + cmake --build . -j + cmake --build . --target install + ctest -The SIX (Sensor Independent XML) library was developed at the National Geospatial-Intelligence Agency (NGA) in collaboration -with [Maxar](http://maxar.com) (formerly Radiant Solutions and MDA). The government has "unlimited rights" and is releasing -this software to increase the impact of government investments by providing developers with the opportunity to take things -in new directions. The software use, modification, and distribution rights are stipulated within the LGPL 3.0 license. +Problems and Configurations +--------------------------- + - If your system compiler does not fully support C++11, you may have to + specify a different one during the configure step. e.g. -The SIX library is a cross-platform C++ API for reading and writing NGA's complex phase history (CPHD), complex (SICD), -and derived (SIDD) sensor independent radar formats; Python bindings are gradually being added as well. Additionally it -is the official reference implementation library for the -[SIDD](https://github.com/ngageoint/six-library/wiki/Sensor-Independent-Derived-Data-(SIDD)-Standard) format. The library -also provides a [sensor model implementation](https://github.com/ngageoint/six-library/wiki) of many equations in the -SICD and SIDD document. This sensor model implementation provides the foundations for the SICD and SIDD -[CSM](https://github.com/sminster/csm) (Community Sensor Model) implementation. + cmake -DCMAKE_C_COMPILER=/some/path/gcc/4.9.1/bin/gcc -DCMAKE_CXX_COMPILER=/...../bin/g++ .. -It is available as open-source software under the Lesser GNU Public License (LGPL). This license is commonly used in the -open-source community, and allows applications that are not open source to make use of the library without penalty. As with -other open source projects, the library is available as-is, with no warranty. + - Pass -DCMAKE_INSTALL_PREFIX to set the install location. -See the [manual](https://github.com/ngageoint/six-library/blob/master/docs/six-manual.pdf) for detailed information including -build instructions and API documentation. + - Python and C++ bindings are built. Just make sure the relevant tools + are on your PATH. Java and MATLAB bindings are now in the **archive** directory + and no longer built. -A preliminary CMake build system is available on Linux and Windows. See [coda-oss CMake README.md](externals/coda-oss/cmake/README.md) -and [nitro README.md](externals/nitro/README.md) for information on how to build using CMake. The same configuration options -may be passed to SIX. + - See the [coda-oss CMake build README](externals/coda-oss/cmake/README.md) + for further build configuration information, particularly for Python-related + details. The same options there may be passed to Nitro. -The latest version of the library is available at https://github.com/ngageoint/six-library.git. + - Build types `Release`, `RelWithDebInfo`, and `Debug` may be chosen + - On Linux, debug symbols are available by default (`RelWithDebInfo`). Configure build type with [-DCMAKE_BUILD_TYPE](https://cmake.org/cmake/help/v3.0/variable/CMAKE_BUILD_TYPE.html) + - On Windows, release type should be configured during the build and install steps -### Releases -The master is considered stable, but official [releases](https://github.com/ngageoint/six-library/releases) also occur as -major features are added. + cmake --build . --config Release -j + cmake --build . --config Release --target install + The CMake default build type `Debug` may not work with Python, unless the Python installation includes debug versions of the Python libraries. + - Regenerating python bindings + - Currently, cmake configuration for regenerating swig bindings is incomplete and use of `waf` is required. + - The `.regenerate_python_bindings.py` script is wrapper around `waf` can be run to quickly update these files. -### Pull Requests + python3 .regenerate_python_bindings.py + DEBUG_PY_BINDINGS=1 python3 .regenerate_python_bindings.py # see all details + - This is typically required when project dependencies (e.g. CODA-OSS) are updated. -All pull request contributions to this project will be released under the LGPL 3.0 license. + - If the CMake build system does not support a required feature that Waf does, create + an issue or a pull request! -Software source code previously released under an open source license and then modified by NGA staff is considered a -"joint work" (see 17 USC 101); it is partially copyrighted, partially public domain, and as a whole is protected by the -copyrights of the non-government authors and must be released according to the terms of the original open source license. -### Contact -February 2022, Dan Smith maxar +Building with Waf +----------------- +Waf is the legacy build system. Below are all of the options available. + + + > python waf --help + waf [command] [options] + + Main commands (example: ./waf build -j4) + build : builds the project + clean : removes the build files + configure: configures the project + dist : makes a tarball for redistributing the sources + distcheck: checks if the sources compile (tarball from 'dist') + install : installs the build files + uninstall: removes the installed files + + Options: + --version show program's version number and exit + -h, --help show this help message and exit + -j JOBS, --jobs=JOBS amount of parallel jobs (8) + -k, --keep keep running happily on independent task groups + -v, --verbose verbosity level -v -vv or -vvv [default: 0] + --nocache ignore the WAFCACHE (if set) + --zones=ZONES debugging zones (task_gen, deps, tasks, etc) + -p, --progress -p: progress bar; -pp: ide output + --targets=COMPILE_TARGETS + build given task generators, e.g. "target1,target2" + --enable-warnings Enable warnings + --enable-debugging Enable debugging + --enable-64bit Enable 64bit builds + --enable-doxygen Enable running doxygen + --with-cflags=FLAGS Set non-standard CFLAGS + --with-cxxflags=FLAGS + Set non-standard CXXFLAGS (C++) + --with-defs=DEFS Use DEFS as macro definitions + --with-optz=OPTZ Specify the optimization level for optimized/release builds + --libs-only Only build the libs (skip building the tests, etc.) + --shared Build all libs as shared libs + --disable-symlinks Disable creating symlinks for libs + --disable-java Disable java (default) + --with-java-home=JAVA_HOME + Specify the location of the java home + --require-java Require Java lib/headers (configure option) + --nopyc Do not install bytecode compiled .pyc files (configuration) [Default:install] + --nopyo Do not install optimised compiled .pyo files (configuration) [Default:install] + --disable-python Disable python + --require-python Require Python lib/headers (configure option) + --enable-openjpeg Enable openjpeg + + configuration options: + -b BLDDIR, --blddir=BLDDIR + build dir for the project (configuration) + -s SRCDIR, --srcdir=SRCDIR + src dir for the project (configuration) + --prefix=PREFIX installation prefix (configuration) [default: '/usr/local/'] + + installation options: + --destdir=DESTDIR installation root [default: ''] + -f, --force force file installation + + C Compiler Options: + --check-c-compiler=CHECK_C_COMPILER + On this platform (linux) the following C-Compiler will be checked by default: "gcc icc suncc" + + C++ Compiler Options: + --check-cxx-compiler=CHECK_CXX_COMPILER + On this platform (linux) the following C++ Compiler will be checked by default: "g++ icpc + sunc++" + + + +Sample Build Scenario +--------------------- + > python waf configure --enable-debugging --prefix=installed + > python waf build + > python waf install + + +Enabling a debugger +------------------- +`-g` and its variants can be achieved at configure time using the +`--enable-debugging` switch at waf configure time + +Memory Debugging +---------------- +To ease debugging and memory leak detection, macros are used +to malloc, realloc and free information. +`NITF_MALLOC()`, `NITF_REALLOC()`, and `NITF_FREE()` should be used +instead of the stdlib.h functions. + +If you defined `NITF_DEBUG` during compilation +(using configure, give the argument `--with-defs="-DNITF_DEBUG"` +and this will occur automatically), you will get +an memory image information dump every time you run an executable, +named `memory_trace.` where `` is the PID of the process +you just ran. There is a verification tool located in +nitf/tests/verify, called `mem_sane.pl`. If you run `mem_sane.pl` +with the memory trace as the single argument, you will get a +formatted output of all memory that is questionably allocated +or deallocated in the nitf library's calls. Please, please, please +check your stuff. + +C Conventions +------------- +In order to keep the C code easy to program and debug, and +above all, OO, we stick to certain conventions herein: + +* All constructors must be passed an error + On failure, they return `NULL`, and populate the error + +* All destructors must `NULL` set the object after they + are done deleting, and should check the object prior, + to make sure that it has not been deleted already. + This means, of course, that all destructors take a pointer + to the object. In practice, usually most of these, then, + take double pointers (where usually you pass it a pointer + by address) + +* All objects are in structs with an underscore in front of + their name, and a typedef to the real name (.e.g., + `struct _nitf_PluginRegistry` => `nitf_PluginRegistry`) + +* All functions that are non-static should be wrapped in + a `NITFAPI(return-val)` or `NITFPROT(return-val)` for protected + data. + +* This allows for easy macro definitions in order to + control the decoration algorithm for windows, and to assure + that the import decoration and + export decoration are identical (otherwise we cant use them) + +* IMPORTANT: The difference between `NITFAPI()` and `NITFPROT()` + is that the C++ code binding generator exposes API() calls + and ignores PROT() calls. + +* All enumerations and constants have a NITF/NITF20/NITF21 + prefix. Along these lines, all functions and objects + are prefixed with a 'namespace' (nitf/nitf20/nitf21). + +Platforms +--------- +While the ultimate goal is to be cross-platform and cross-language, +the C and C++ layers get the most support. + +The Python layer gets some use for scripting convenience. + +The MATLAB and JAVA layers have not been touched in years; they are +no longer built, code remains in the **archive** directory. + +TREs need to be coded in C (only). + +Before you commit +----------------- +* Create a unit test for your all code you + are adding + +* Compile and test. (`ctest`) + +* A clang-format script is available at `externals/coda-oss/.clang-format`. + Use it. + +* Doxygen on root directory and view in + browser the doxygen code (in nitf/doc/html/). + +Doxygen Commenting +------------------ +Please make an effort to write doxygen comments. I know, +especially in C, that doxygen has some issues. However, +its the best, cheapest thing we have, and its important +to have the APIs documented. It will save me the trouble +of fixing it later, which will make me eternally grateful. + + +NITF Library Users: General Issues +---------------------------------- +NITRO handles TREs by loading dynamic libraries at runtime. Therefore, you need +to make sure NITRO can find them. + +* If you are building from source, the location will be compiled in, and + you don't have to do anything extra. + +* If you are working from a binary release, you will have to tell + NITRO where the plugins are by setting the `NITF_PLUGIN_PATH` + enviornment variable. + This should look something like `/share/nitf/plugins`. + +* If you wish to use a custom TRE location, you can also specify that + with `NITF_PLUGIN_PATH`. + +Contact +--------- + +February 2022, Dan Smith Maxar diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 6aadfa0da1..7111a792e9 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,106 +1,68 @@ -![alt tag](https://raw.github.com/ngageoint/six-library/master/docs/six_logo.png?raw=true) +# NITRO (NITF i/o) Release Notes -# SIX [Release](https://github.com/ngageoint/six-library/releases) Notes +## [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. -## [Version 3.2.5](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.5); October 23, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23) -* [nitro](https://github.com/mdaus/nitro) version [2.11.5](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.5) -* Simplify 8AMP_PHSI interfaces. -* Be more explicit about the CPHD version being used. -* *io::OutputStream* overloads to make it easier to write CPHD data in pieces. -* Be sure XML strings are UTF-8. - -## [Version 3.2.4](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.4); August 21, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) -* [nitro](https://github.com/mdaus/nitro) version [2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4) -* Prepare for deprecating [`std::complex`](https://en.cppreference.com/w/cpp/numeric/complex), et. al. -* Allow XML metadata to be parsed with `preserveCharacterData(true)` to keep white-space. -* Added support for [CPHD 1.1.0](https://nsgreg.nga.mil/doc/view?i=5388) XML metadata. -* Bugfix: read SIDDs [without a LUT](https://github.com/ngageoint/six-library/pull/683). -* Bugfix: [CPHD 'releaseInfo' can be empty](https://github.com/ngageoint/six-library/pull/670). +## [Version 2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4); August 18 5, 2023 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) * Added **.gitattributes** and normalized line-endings (`\n` for most text files). -## [Version 3.2.3](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.3); June 5, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05) -* [nitro](https://github.com/mdaus/nitro) version [2.11.3](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.3) -* Integrated [ISM v201609](https://www.dni.gov/index.php/who-we-are/organizations/ic-cio/ic-cio-related-menus/ic-cio-related-links/ic-technical-specifications/information-security-marking-metadata) into SIDD 3.0. -* Retain "legacy" support for ISM-v13 with SIDD 3.0. -* Tweak `DataWriter` implementation in preperation for future changes. -* CPHD wasn't parsing all optional fields correctly. +## [Version 2.11.3](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.3); June 5, 2023 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05) +* Fix display of [certain TREs](https://github.com/mdaus/nitro/issues/529). * Adjust compiler flags for clean *CMake* builds. - -## [Version 3.2.2](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.2); December 14, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14) -* [nitro](https://github.com/mdaus/nitro) version [2.11.2](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.2) -* [Fixed slantToImagePartials not operating in slant plane](https://github.com/ngageoint/six-library/pull/613) -* Continued effort at getting unittests to run in other projects. - -## [Version 3.2.1](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.1); November 4, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04) -* [nitro](https://github.com/mdaus/nitro) version [2.11.1](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.1) -* cphd::PhaseSGN accepts both `1` and `+1`, toString() is now `"1"` instead of `"+1"`. -* CPHD XML parser handles URI's for versions 1.0.0, 1.0.1, and 1.1.0; unit test updated to test metadata parsing extensions - -## [Version 3.2.0](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.0); August 30, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14) -* [nitro](https://github.com/mdaus/nitro) version [2.11.0](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.0) -* This version is identical to [Version 3.1.14](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.14) except that C++14 is now required. - -## [Version 3.1.14](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.14); August 30, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30) -* [nitro](https://github.com/mdaus/nitro) version [2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12) -* Routines that "traffic" in XML strings (e.g., `parseDataFromString()` or `toXMLString()`) now use - `std::u8string` (actually `coda_oss::u8string`) instead of `std::string`. -* Fixed memory leak in `ComplexXMLParser`. -* Files in **six/projects/csm/external/csm-3.0.4** are unchanged (almost!) from [CSM 3.0.4](https://github.com/ngageoint/csm/releases/tag/v3.0.4). -* Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/ngageoint/six-library/tree/main). - -## [Version 3.1.13](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.13); August 2, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-02](https://github.com/mdaus/coda-oss/releases/tag/2022-08-02) -* [nitro](https://github.com/mdaus/nitro) version [2.10.11](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.11) -* Better handling of optional error fields -* `vtsSetEnv` command - -## [Version 3.1.12](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.12); June 29, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-06-29](https://github.com/mdaus/coda-oss/releases/tag/2022-06-29) -* [nitro](https://github.com/mdaus/nitro) version [2.10.10](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.10) -* Support `OTHER.*` polarization values in XML from SIDD 3.0/SICD 1.3 -* Updated to [CSM 3.0.4](https://github.com/ngageoint/csm/releases/tag/v3.0.4). -* Implements the back-end C++ changes from #351. - - * Support writing multiple CPHD channels to file from a single wideband buffer. - * Support 1-, 2-, and 4-byte datatypes within the `PVPBlock`. All user-defined PVP were hard-coded to 8-byte types before. - * Make `cphd::PVPBlock` used `std::map` to store added PVP parameters instead of `std::unordered_map`; - this was needed to support older versions of SWIG. - * Fix signal datatype in PVP to be 8-byte integer according to the CPHD v1.x spec. Was set to double previously. - -* Fix `getARPVector()` and `getARPVelocityVector()` methods to return vectors filled with constant values; - these values are used when performing `imageToSceneAdjustment`. - -## [Version 3.1.11](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.11); May 13, 2022 -* Lastest [coda-oss](https://github.com/mdaus/coda-oss) and [nitro](https://github.com/mdaus/nitro) (updates from **master**, no new releases) -* Fix bug in XML serializaton where `double`s were given a class of `xs::double` (two `:`s) instead of `xs:double`. - -## [Version 3.1.10](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.10); May 3, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-05-03](https://github.com/mdaus/coda-oss/releases/tag/2022-05-03) -* [nitro](https://github.com/mdaus/nitro) version [2.10.9](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.9) -* improve performance of *AMP8I_PHS8I* reading. - -## [Version 3.1.9](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.9); February 22, 2022 (aka 2/22/22) -* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-02-22](https://github.com/mdaus/coda-oss/releases/tag/2022-02-22) -* [nitro](https://github.com/mdaus/nitro) version [2.10.8](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.8) -* replace KDTree *`std::complex` -> AMP8I_PHS8I conversion* with a - ["math based" approach](https://github.com/ngageoint/six-library/pull/537#issuecomment-1026453353). -* restore SIDD 2.0 `AngleMagnitudeType`, SIDD 3.0 is `AngleZeroToExclusive360MagnitudeType` -* bugfix: "We found a bug/mistake/error in **six.sicd/source/RadarCollection.cpp**, specifically the function to rotate the Area\Plane\SegmentList block." - -## [Version 3.1.8](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.8); December 13, 2021 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2021-12-13](https://github.com/mdaus/coda-oss/releases/tag/2021-12-13) -* [nitro](https://github.com/mdaus/nitro) version [2.10.7](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.7) -* write [8AMPI_PHSI](https://github.com/ngageoint/six-library/tree/feature/8AMPI_PHSI) files -* update schema for [SIDD 3.0](https://github.com/ngageoint/six-library/tree/feature/SIDD-3.0) +* Implement `DecompressionInterface::adapterFreeBlock()` to fix decompression. + +## [Version 2.11.2](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.2); December 14, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14) +* Further work at getting unittests to work better when included elsewhere (e.g., SIX) as **externals**. + +## [Version 2.11.1](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.1); November 4, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04) +* fixed incorrect field sizes in the CSEXRB TRE. +* make unittests work better when included elsewhere (e.g., SIX) as **externals**. +* remove exception specifications +* `tarfile.extractall()` sanitization + +## [Version 2.11.0](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.0); August 30, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14) +* Cut from [main](https://github.com/mdaus/nitro/tree/main); identical to [Version 2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12) +except that C++14 is now required. [master](https://github.com/mdaus/nitro/tree/master) remains at C++11. + +## [Version 2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12); August 30, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30) +* Build JPEG decompression as a plug-in. +* tweak unittests so they run in SIX. +* ~~Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/mdaus/nitro/tree/main).~~ + +## [Version 2.10.11](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.11); August 2, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-02](https://github.com/mdaus/coda-oss/releases/tag/2022-08-02) +* remove more compiler warnings + +## [Version 2.10.10](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.10); June 29, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-06-29](https://github.com/mdaus/coda-oss/releases/tag/2022-06-29) + +## [Version 2.10.9](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.9); May 3, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-05-03](https://github.com/mdaus/coda-oss/releases/tag/2022-05-03) +* the large unused **archive** directory has been removed; contents are in [archive/java](https://github.com/mdaus/nitro/tree/archive/java) +and [archive/mex](https://github.com/mdaus/nitro/tree/archive/mex). +* the large unused **docs** directory has been removed; contents are in [archive/docs](https://github.com/mdaus/nitro/tree/archive/docs). +* Copy the J2K wrappers from **coda**. + +## [Version 2.10.8](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.8); February 22, 2022 (aka 2/22/22) +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-02-22](https://github.com/mdaus/coda-oss/releases/tag/2022-02-22) +* Show how to use [strongly typed TREs](https://github.com/mdaus/nitro/tree/feature/strongly-typed-TREs). +* Infrastucture to support "[reflection](https://github.com/mdaus/nitro/tree/feature/reflection)" over C `struct`s. +* Begin C++ wrappers for the C *j2k* routines; work-in-progress. + +## [Version 2.10.7](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.7); December 13, 2021 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2021-12-13](https://github.com/mdaus/coda-oss/releases/tag/2021-12-13) +* allow `NITF_PLUGIN_PATH` warning to be turned off +* tweaks to compile with older C++11 compilers +* build with Visual Studio 2022 ----- ## Contact -February 2022, Dan Smith Maxar +February 2022, Dan Smith Maxar \ No newline at end of file diff --git a/UnitTest/CppUnitTestAssert.cpp b/UnitTest/CppUnitTestAssert.cpp index d2d76d169e..13b75386ac 100644 --- a/UnitTest/CppUnitTestAssert.cpp +++ b/UnitTest/CppUnitTestAssert.cpp @@ -1,41 +1,5 @@ #include "pch.h" #include "TestCase.h" -#include "str/Encoding.h" - -using namespace Microsoft::VisualStudio::CppUnitTestFramework; - -// EQUALS_MESSAGE() wants ToString() specializations (or overloads) for our types, which is a nusiance. -// This hooks up our existing str::toString() into the VC++ unit-test infrastructure - -// C++ hack to call private methods -// https://stackoverflow.com/a/71578383/8877 - -using FailOnCondition_t = void(bool condition, const unsigned short* message, const __LineInfo* pLineInfo); // declare method's type -using GetAssertMessage_t = std::wstring(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare method's type -template -struct caller final // helper structure to inject call() code -{ - friend void FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo) - { - fFailOnCondition(condition, message, pLineInfo); - } - - friend std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message) - { - return fGetAssertMessage(equality, expected, actual, message); - } -}; -template struct caller<&Assert::FailOnCondition, &Assert::GetAssertMessage>; // even instantiation of the helper - -void FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo); // declare caller -void test::Assert::FailOnCondition(bool condition, const unsigned short* message, const __LineInfo* pLineInfo) -{ - ::FailOnCondition(condition, message, pLineInfo); // and call! -} - -std::wstring GetAssertMessage(bool equality, const std::wstring& expected, const std::wstring& actual, const wchar_t *message); // declare caller -std::wstring test::Assert::GetAssertMessage(bool equality, const std::string& expected, const std::string& actual, const wchar_t *message) -{ - return ::GetAssertMessage(equality, str::details::to_wstring(expected), str::details::to_wstring(actual), message); // and call! -} +// Can't get this to build in the **coda-oss** project. +#include "sys/source/CppUnitTestAssert_.cpp_" diff --git a/UnitTest/Test.cpp b/UnitTest/Test.cpp deleted file mode 100644 index 288bc85ad2..0000000000 --- a/UnitTest/Test.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "pch.h" -#include "Test.h" - -#include - -#include - -namespace fs = std::filesystem; - -static bool is_x64_Configuration(const fs::path& path) // "Configuration" is typically "Debug" or "Release" -{ - const std::string build_configuration = -#if defined(NDEBUG) // i.e., release - "Release"; -#else - "Debug"; -#endif - - const auto Configuration = path.filename(); - const auto path_parent_path = path.parent_path(); - const auto x64 = path_parent_path.filename(); - return (Configuration == build_configuration) && (x64 == "x64"); -} - -static bool is_install_unittests(const fs::path& path) -{ - const auto unittests = path.filename(); - const auto path_parent_path = path.parent_path(); - const auto install = path_parent_path.filename(); - return (unittests == "unittests") && (install == "install"); -} -static bool is_install_tests(const fs::path& path) -{ - const auto tests = path.filename(); - const auto path_parent_path = path.parent_path(); - const auto install = path_parent_path.filename(); - return (tests == "tests") && (install == "install"); -} - -fs::path six::Test::buildSchemaDir() -{ - const auto cwd = fs::current_path(); - - const sys::OS os; - const auto exec = fs::path(os.getCurrentExecutable()); - const auto argv0 = exec.filename(); - if ((argv0 == "Test.exe") || (argv0 == "testhost.exe")) - { - // Running GTest unit-tests in Visual Studio on Windows - if (is_x64_Configuration(cwd)) - { - const auto root_path = cwd.parent_path().parent_path(); - return root_path / "six" / "modules" / "c++" / "six.sidd" / "conf" / "schema"; - } - } - - if (argv0 == "unittests.exe") - { - // stand-alone unittest executable on Windows (ends in .EXE) - const auto parent_path = exec.parent_path(); - if (is_x64_Configuration(parent_path)) - { - const auto parent_path_ = parent_path.parent_path().parent_path(); - return parent_path_ / "dev" / "tests" / "images"; - } - } - - // stand-alone unit-test on Linux - const auto exec_dir = exec.parent_path(); - if (is_install_unittests(exec_dir)) - { - const auto install = exec_dir.parent_path(); - return install / "unittests" / "data"; - } - if (is_install_tests(exec_dir)) - { - const auto install = exec_dir.parent_path(); - return install / "unittests" / "data"; - } - - if (argv0 == "unittests") - { - // stand-alone unittest executable on Linux - const auto bin = exec.parent_path(); - if (bin.filename() == "bin") - { - const auto unittests = bin.parent_path(); - return unittests / "unittests" / "data"; - } - } - - //fprintf(stderr, "cwd = %s\n", cwd.c_str()); - //fprintf(stderr, "exec = %s\n", exec.c_str()); - - return cwd; -} diff --git a/UnitTest/Test.h b/UnitTest/Test.h index 057b8d5209..a9ac754ab4 100644 --- a/UnitTest/Test.h +++ b/UnitTest/Test.h @@ -1,11 +1,8 @@ #pragma once -#include +#include "nitf/unittests/Test.h" +#include "TestCase.h" -namespace six -{ - namespace Test - { - extern std::filesystem::path buildSchemaDir(); - } -} \ No newline at end of file +#define TEST_ASSERT_EQ_INT(X1, X2) TEST_ASSERT_EQ(X2, X1) +#define TEST_ASSERT_EQ_STR(X1, X2) TEST_ASSERT_EQ(std::string(X1), std::string(X2)) +#define TEST_ASSERT_EQ_FLOAT(X1, X2) TEST_ASSERT_EQ(static_cast(X1), static_cast(X2)) \ No newline at end of file diff --git a/UnitTest/TestCase.h b/UnitTest/TestCase.h index 225afd7bda..2c8a470500 100644 --- a/UnitTest/TestCase.h +++ b/UnitTest/TestCase.h @@ -1,100 +1,7 @@ #pragma once -#include -#include - -#include "CppUnitTest.h" -#include -#include - -#undef TEST_CHECK -#undef TEST_ASSERT #undef TEST_ASSERT_NULL -#undef TEST_ASSERT_TRUE -#undef TEST_ASSERT_FALSE -#undef TEST_MAIN -#undef TEST_CASE -#define TEST_CHECK(X) -#define TEST_MAIN(X) -#define TEST_ASSERT_NULL(X) testName, Microsoft::VisualStudio::CppUnitTestFramework::Assert::IsNull((X)) -#define TEST_ASSERT_TRUE(X) testName, Microsoft::VisualStudio::CppUnitTestFramework::Assert::IsTrue((X)) -#define TEST_ASSERT_FALSE(X) testName, Microsoft::VisualStudio::CppUnitTestFramework::Assert::IsFalse((X)) -#define TEST_ASSERT(X) TEST_ASSERT_TRUE(X) -#define CODA_OSS_testMethod_(X) testMethod ## _ ## X -#define TEST_CASE(X) TEST_METHOD(X) { CODA_OSS_testMethod_(X)(#X); } void CODA_OSS_testMethod_(X)(std::string testName) - -namespace test -{ - struct Assert final - { - static void FailOnCondition(bool condition, const unsigned short* message, const Microsoft::VisualStudio::CppUnitTestFramework::__LineInfo* pLineInfo); - static std::wstring GetAssertMessage(bool equality, const std::string& expected, const std::string& actual, const wchar_t *message); - }; -#define CODA_OSS_equals_message_(expected, actual, message) reinterpret_cast(test::Assert::GetAssertMessage(true, str::toString(expected), str::toString(actual), message).c_str()) -#define CODA_OSS_not_equals_message_(notExpected, actual, message) reinterpret_cast(test::Assert::GetAssertMessage(false, str::toString(notExpected), str::toString(actual), message).c_str()) - -// see Assert::AreEqual<> -template -inline void diePrintf_eq(const TExpected& expected, const TActual& actual, - const wchar_t* message = NULL, const Microsoft::VisualStudio::CppUnitTestFramework::__LineInfo* pLineInfo = NULL) -{ - Assert::FailOnCondition(expected == actual, CODA_OSS_equals_message_(expected, actual, message), pLineInfo); -} - -// see Assert::AreNotEqual<> -template -inline void diePrintf_ne(const TExpected& notExpected, const TActual& actual, - const wchar_t* message = NULL, const Microsoft::VisualStudio::CppUnitTestFramework::__LineInfo* pLineInfo = NULL) -{ - Assert::FailOnCondition(!(notExpected == actual), CODA_OSS_not_equals_message_(notExpected, actual, message), pLineInfo); -} -} -#undef CODA_OSS_test_diePrintf_eq_ -#undef CODA_OSS_test_diePrintf_not_eq_ -#define CODA_OSS_test_diePrintf_eq_(X1, X2) testName, test::diePrintf_eq(X1, X2) -#define CODA_OSS_test_diePrintf_not_eq_(X1, X2) testName, test::diePrintf_ne(X1, X2) - -template -inline void test_assert_greater_(const TX1& X1, const TX2& X2) -{ - Microsoft::VisualStudio::CppUnitTestFramework::Assert::IsTrue(X1 > X2); -} -#undef TEST_ASSERT_GREATER -#define TEST_ASSERT_GREATER(X1, X2) testName, test_assert_greater_(X1, X2) - -#undef TEST_ASSERT_ALMOST_EQ_EPS -#define TEST_ASSERT_ALMOST_EQ_EPS(X1, X2, EPS) { (void)testName; Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreEqual(X1, X2, EPS); Microsoft::VisualStudio::CppUnitTestFramework::Assert::AreEqual(X2, X1, EPS); } -namespace test -{ -inline void assert_almost_eq(const std::string& testName, float X1, float X2) -{ - constexpr auto EPS = static_cast(0.0001); - TEST_ASSERT_ALMOST_EQ_EPS(X1, X2, EPS); -} -inline void assert_almost_eq(const std::string& testName, double X1, double X2) -{ - constexpr auto EPS = static_cast(0.0001); - TEST_ASSERT_ALMOST_EQ_EPS(X1, X2, EPS); -} -inline void assert_almost_eq(const std::string& testName, long double X1, long double X2) -{ - assert_almost_eq(testName, static_cast(X1), static_cast(X2)); -} -} - -#undef TEST_ASSERT_ALMOST_EQ -#define TEST_ASSERT_ALMOST_EQ(X1, X2) test::assert_almost_eq(testName, X1, X2) - -#undef TEST_ASSERT_EQ_MSG -#define TEST_ASSERT_EQ_MSG(msg, X1, X2) testName, Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(msg.c_str()); TEST_ASSERT_EQ(X1, X2) - -#undef TEST_FAIL -#define TEST_FAIL(msg) { (void)testName; const auto vw(str::details::to_wstring(msg)); Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(vw.c_str()); } - -#undef TEST_EXCEPTION -#undef TEST_THROWS -#define TEST_EXCEPTION(X) (void)testName; try{ (X); TEST_FAIL("Should have thrown exception"); } catch (const except::Throwable&){} -#define TEST_THROWS(X) (void)testName; try{ (X); TEST_FAIL("Should have thrown exception"); } catch (...){} - - - +#undef TEST_ASSERT +#undef TEST_ASSERT_ALMOST_EQ +#undef TEST_ASSERT_EQ +#include diff --git a/externals/nitro/UnitTest/UnitTest.cpp b/UnitTest/UnitTest.cpp similarity index 100% rename from externals/nitro/UnitTest/UnitTest.cpp rename to UnitTest/UnitTest.cpp diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj index 46599527c8..547527c2ab 100644 --- a/UnitTest/UnitTest.vcxproj +++ b/UnitTest/UnitTest.vcxproj @@ -12,7 +12,7 @@ 17.0 - {F6888896-E658-414C-90CD-1208FA31A22E} + {8ACE478C-8F6F-4D42-9B43-7D75882D4BE1} Win32Proj UnitTest 10.0 @@ -57,13 +57,14 @@ Use Level4 true - $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - _DEBUG;SIX_DEFAULT_SCHEMA_PATH=R"($(SolutionDir)install-$(Configuration)-$(Platform).$(PlatformToolset)\conf\schema\six)";%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING; CODA_OSS_LIBRARY_SHARED + $(ProjectDir);$(SolutionDir)modules\c\nrt\include;$(SolutionDir)modules\c\nitf\include;$(SolutionDir)modules\c++\nitf\include;$(SolutionDir)modules\c\j2k\include;$(SolutionDir)modules\c;$(SolutionDir)modules\c++;$(SolutionDir)externals\coda-oss\modules\c++;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions);CODA_OSS_LIBRARY_SHARED=1 + true pch.h - true AdvancedVectorExtensions2 - true MultiThreadedDebugDLL + true + true true true true @@ -82,16 +83,16 @@ true true true - $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING; CODA_OSS_LIBRARY_SHARED + $(ProjectDir);$(SolutionDir)modules\c\nrt\include;$(SolutionDir)modules\c\nitf\include;$(SolutionDir)modules\c++\nitf\include;$(SolutionDir)modules\c\j2k\include;$(SolutionDir)modules\c;$(SolutionDir)modules\c++;$(SolutionDir)externals\coda-oss\modules\c++;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions);CODA_OSS_LIBRARY_SHARED=1 + true pch.h - true AdvancedVectorExtensions2 + Guard + true true true true - Guard - Speed Windows @@ -101,193 +102,154 @@ - - true - true - - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - + + + Create Create - - - - + - - - - - @@ -295,37 +257,12 @@ {9997e895-5161-4ddf-8f3f-099894cb2f21} - + {8f357a19-799e-4971-850e-3f28485c130b} - + {f06550ad-cfc7-40b8-8727-6c82c69a8982} - - {78849481-d356-4cc7-b182-31c21f857ed1} - - - {016ef417-e41c-404c-b3b5-34b6cdd94bb3} - - - {01be4480-9620-4ded-b34f-d2e3ab4b7c8b} - - - {1cfcde59-6410-4037-95eb-b37d31e10820} - - - {34ac2314-fbd1-42ad-aaf4-0cebc6bf737e} - - - {ddc587c2-53ba-44a9-94e7-07be52af3d0b} - - - {62aad4dd-35ba-41a0-8263-1f4dfd755689} - - - - - diff --git a/UnitTest/UnitTest.vcxproj.filters b/UnitTest/UnitTest.vcxproj.filters index 440a0297ed..4b8da65dfc 100644 --- a/UnitTest/UnitTest.vcxproj.filters +++ b/UnitTest/UnitTest.vcxproj.filters @@ -1,194 +1,135 @@  - - - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd - - - cphd + + {d6b8959a-344d-4af2-b926-05be973609a4} + + + {a03980e8-d43d-473b-9f2a-a883ddd94df0} + + + {555282a7-bf5d-4012-842a-435bfb7324ab} + + + + + nrt - - cphd + + + nrt - - cphd + + + nrt - - cphd + + nrt - - cphd03 + + nrt - - cphd03 + + nrt - - cphd03 + + nrt - - cphd03 + + nrt - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sicd + + nitf-c++ - - sidd + + nitf-c++ - - sidd + + nitf-c++ - - sidd + + nitf-c++ - - sidd + + nitf-c++ - - sidd + + nitf-c++ - - sidd + + nitf-c++ - - six + + nitf-c++ - - six + + nitf-c++ - - six + + nitf-c++ - - six + + nitf-c++ - - six + + nitf-c++ + - - cphd - - - cphd03 - - - sicd - - - sidd - - - six - - - - - {004a37ca-2175-4642-988e-94516ea1a147} - - - {ef494548-4aed-4ebb-a93c-b56a11f17f5e} - - - {593807ae-bc84-424f-ba11-0537277cd2fc} - - - {f8053c57-ba04-41c4-8dd8-2056f5a19f25} - - - {8d8a73fb-96b1-4bdf-a055-2b34d7f94e14} - - - - - sidd - - - sidd - \ No newline at end of file diff --git a/UnitTest/cphd.cpp b/UnitTest/cphd.cpp deleted file mode 100644 index 1ceff4f00f..0000000000 --- a/UnitTest/cphd.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include "pch.h" - -#include "cphd_Test.h" - -namespace cphd -{ - -TEST_CLASS(test_channel) { public: -#include "six/modules/c++/cphd/unittests/test_channel.cpp" -}; - -TEST_CLASS(test_compressed_signal_block_round) { public: -#include "six/modules/c++/cphd/unittests/test_compressed_signal_block_round.cpp" -}; - -TEST_CLASS(test_cphd_xml_control) { public: -#include "six/modules/c++/cphd/unittests/test_cphd_xml_control.cpp" -}; - -TEST_CLASS(test_cphd_xml_optional) { public: -#include "six/modules/c++/cphd/unittests/test_cphd_xml_optional.cpp" -}; - -TEST_CLASS(test_dwell) { public: -#include "six/modules/c++/cphd/unittests/test_dwell.cpp" -}; - -TEST_CLASS(test_file_header) { public: -#include "six/modules/c++/cphd/unittests/test_file_header.cpp" -}; - -TEST_CLASS(test_pvp) { public: -#include "six/modules/c++/cphd/unittests/test_pvp.cpp" -}; - -TEST_CLASS(test_pvp_block) { public: -#include "six/modules/c++/cphd/unittests/test_pvp_block.cpp" -}; - -TEST_CLASS(test_pvp_block_round) { public: -#include "six/modules/c++/cphd/unittests/test_pvp_block_round.cpp" -}; - -TEST_CLASS(test_read_wideband) { public: -#include "six/modules/c++/cphd/unittests/test_read_wideband.cpp" -}; - -TEST_CLASS(test_reference_geometry) { public: -#include "six/modules/c++/cphd/unittests/test_reference_geometry.cpp" -}; - -TEST_CLASS(test_signal_block_round) { public: -#include "six/modules/c++/cphd/unittests/test_signal_block_round.cpp" -}; - -TEST_CLASS(test_support_block_round) { public: -#include "six/modules/c++/cphd/unittests/test_support_block_round.cpp" -}; - -} \ No newline at end of file diff --git a/UnitTest/cphd03.cpp b/UnitTest/cphd03.cpp deleted file mode 100644 index dcb73d1d18..0000000000 --- a/UnitTest/cphd03.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "pch.h" - -#include "cphd03_Test.h" - -namespace cphd03 -{ - -TEST_CLASS(test_cphd_read_unscaled_int) { public: -#include "six/modules/c++/cphd03/unittests/test_cphd_read_unscaled_int.cpp" -}; - -TEST_CLASS(test_cphd_write) { public: -#include "six/modules/c++/cphd03/unittests/test_cphd_write.cpp" -}; - -TEST_CLASS(test_vbm) { public: -#include "six/modules/c++/cphd03/unittests/test_vbm.cpp" -}; - -} \ No newline at end of file diff --git a/UnitTest/cphd03_Test.h b/UnitTest/cphd03_Test.h deleted file mode 100644 index 3afe31bc4e..0000000000 --- a/UnitTest/cphd03_Test.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "CppUnitTest.h" -#include "TestCase.h" diff --git a/UnitTest/cphd_Test.h b/UnitTest/cphd_Test.h deleted file mode 100644 index c2a8ba1829..0000000000 --- a/UnitTest/cphd_Test.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CppUnitTest.h" -#include "TestCase.h" \ No newline at end of file diff --git a/externals/nitro/UnitTest/nitf-c++.cpp b/UnitTest/nitf-c++.cpp similarity index 100% rename from externals/nitro/UnitTest/nitf-c++.cpp rename to UnitTest/nitf-c++.cpp diff --git a/externals/nitro/UnitTest/nitf-c.cpp b/UnitTest/nitf-c.cpp similarity index 100% rename from externals/nitro/UnitTest/nitf-c.cpp rename to UnitTest/nitf-c.cpp diff --git a/externals/nitro/UnitTest/nrt.cpp b/UnitTest/nrt.cpp similarity index 100% rename from externals/nitro/UnitTest/nrt.cpp rename to UnitTest/nrt.cpp diff --git a/UnitTest/packages.config b/UnitTest/packages.config deleted file mode 100644 index 34505441d9..0000000000 --- a/UnitTest/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/UnitTest/pch.cpp b/UnitTest/pch.cpp index 97b544ec11..64b7eef6d6 100644 --- a/UnitTest/pch.cpp +++ b/UnitTest/pch.cpp @@ -1,6 +1,5 @@ -// -// pch.cpp -// Include the standard header and generate the precompiled header. -// +// pch.cpp: source file corresponding to the pre-compiled header #include "pch.h" + +// When you are using pre-compiled headers, this source file is necessary for compilation to succeed. diff --git a/UnitTest/pch.h b/UnitTest/pch.h index c1e5c99f31..86707841a5 100644 --- a/UnitTest/pch.h +++ b/UnitTest/pch.h @@ -1,100 +1,41 @@ -// -// pch.h -// Header for standard system include files. -// +// pch.h: This is a precompiled header file. +// Files listed below are compiled only once, improving build performance for future builds. +// This also affects IntelliSense performance, including code completion and many code browsing features. +// However, files listed here are ALL re-compiled if any one of them is updated between builds. +// Do not add files here that you will be updating frequently as this negates the performance advantage. -#pragma once +#ifndef PCH_H +#define PCH_H + +// add headers that you want to pre-compile here #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define NOMINMAX +#pragma warning(push) +#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. +#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior +#include +#pragma warning(pop) +#pragma comment(lib, "ws2_32") // We're building in Visual Studio ... used to control where we get a little bit of config info #define NITRO_PCH 1 +#ifndef CODA_OSS_LIBRARY_SHARED +#define CODA_OSS_LIBRARY_SHARED 1 +#endif -#pragma warning(disable: 4668) // '...' is not defined as a preprocessor macro, replacing with '...' for '...' -#pragma warning(disable: 4820) // '...': '...' bytes padding added after data member '...' -#pragma warning(disable: 4710) // '...': function not inlined - -#pragma warning(disable: 5045) // Compiler will insert Spectre mitigation for memory load if / Qspectre switch specified - -#pragma warning(disable: 4625) // '...': copy constructor was implicitly defined as deleted -#pragma warning(disable: 4626) // '...': assignment operator was implicitly defined as deleted -#pragma warning(disable: 5026) // '...': move constructor was implicitly defined as deleted -#pragma warning(disable: 5027) // '...': move assignment operator was implicitly defined as deleted - -// TODO: get rid of these someday? -#pragma warning(disable: 4774) // '...' : format string expected in argument 3 is not a string literal -#pragma warning(disable: 4267) // '...': conversion from '...' to '...', possible loss of data -#pragma warning(disable: 4244) // '...': conversion from '...' to '...', possible loss of data -#pragma warning(disable: 4242) // '...': conversion from '...' to '...', possible loss of data -#pragma warning(disable: 4018) // '...': signed / unsigned mismatch -#pragma warning(disable: 4389) // '...': signed / unsigned mismatch -#pragma warning(disable: 4365) // '...': conversion from '...' to '...', signed / unsigned mismatch -#pragma warning(disable: 5219) // implicit conversion from '...' to '...', possible loss of data -#pragma warning(disable: 4514) // '...': unreferenced inline function has been removed -#pragma warning(disable: 5039) // '...' : pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. -#pragma warning(disable: 5267) // definition of implicit copy constructor for '...' is deprecated because it has a user-provided destructor - -// TODO: get rid of these someday? ... from Visual Studio code-analysis -#pragma warning(disable: 26495) // Variable '...' is uninitialized. Always initialize a member variable(type.6). -#pragma warning(disable: 26451) // Arithmetic overflow : Using operator '...' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '*' to avoid overflow(io.2). -#pragma warning(disable: 6385) // Reading invalid data from '...': the readable size is '...' bytes, but '...' bytes may be read. -#pragma warning(disable: 6386) // Buffer overrun while writing to '...': the writable size is '...' bytes, but '...' bytes might be written. - -#pragma warning(push) -#pragma warning(disable: 5220) // '...': a non - static data member with a volatile qualified type no longer implies -#pragma warning(disable: 5204) // 'Concurrency::details::_DefaultPPLTaskScheduler': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly - -#include "six/modules/c++/cpp_pch.h" -#include +#include +#include +#include #include -#pragma warning(pop) - -#include -#include -#pragma warning(push) -#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under - EHc.Undefined behavior may occur if this function throws an exception. -#pragma warning(disable: 26493) // Don't use C-style casts (type.4). -#pragma warning(disable: 26473) // Don't cast between pointer types where the source type and the target type are the same (type.1). -#include -#include -#include -#include -#include -#pragma warning(pop) -#include -#include -#include -#include -#include -#include - #include -#include -#include - -#include -#include -#include -#include -#include -#include - -#pragma comment(lib, "ws2_32") - -#pragma warning(push) -#pragma warning(disable: 4800) // Implicit conversion from '...' to bool. Possible information loss -#pragma warning(disable: 4388) // '...': signed / unsigned mismatch -#pragma warning(disable: 4866) // compiler may not enforce left-to-right evaluation order for call to '...' - -#include "CppUnitTest.h" -#pragma warning(pop) +#include +#include +#include +#include -#pragma warning(disable: 4464) // relative include path contains '..' +#include "Test.h" -#include "six_Test.h" -#include "sidd_Test.h" -#include "sicd_Test.h" -#include "cphd_Test.h" -#include "cphd03_Test.h" +#endif //PCH_H diff --git a/UnitTest/sicd.cpp b/UnitTest/sicd.cpp deleted file mode 100644 index e0b11986bd..0000000000 --- a/UnitTest/sicd.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "pch.h" - -#include "sicd_Test.h" -#include "Test.h" - -#ifdef _MSC_VER -#pragma warning(disable: 4464) // relative include path contains '..' -#endif -#include "../tests/TestUtilities.h" - -namespace sicd -{ - -TEST_CLASS(test_AMP8I_PHS8I) { public: -#include "six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp" -}; - -TEST_CLASS(test_area_plane) { public: - test_area_plane() { - // initialization code here - sys::OS().setEnv("NITF_PLUGIN_PATH", NITF_PLUGIN_PATH, true /*overwrite*/); - } -#include "six/modules/c++/six.sicd/unittests/test_area_plane.cpp" -}; - -TEST_CLASS(test_CollectionInfo) { public: -#include "six/modules/c++/six.sicd/unittests/test_CollectionInfo.cpp" -}; - -TEST_CLASS(test_filling_geo_data) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_geo_data.cpp" -}; - -TEST_CLASS(test_filling_grid) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_grid.cpp" -}; - -TEST_CLASS(test_filling_pfa) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_pfa.cpp" -}; - -TEST_CLASS(test_filling_position) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_position.cpp" -}; - -TEST_CLASS(test_filling_rgazcomp) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_rgazcomp.cpp" -}; - -TEST_CLASS(test_filling_rma) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_rma.cpp" -}; - -TEST_CLASS(test_filling_scpcoa) { public: -#include "six/modules/c++/six.sicd/unittests/test_filling_scpcoa.cpp" -}; - -TEST_CLASS(test_get_segment) { public: -#include "six/modules/c++/six.sicd/unittests/test_get_segment.cpp" -}; - -TEST_CLASS(test_projection_polynomial_fitter) { public: -#include "six/modules/c++/six.sicd/unittests/test_projection_polynomial_fitter.cpp" -}; - -TEST_CLASS(test_radar_collection) { public: -#include "six/modules/c++/six.sicd/unittests/test_radar_collection.cpp" -}; - -TEST_CLASS(test_update_sicd_version) { public: -#include "six/modules/c++/six.sicd/unittests/test_update_sicd_version.cpp" -}; - -TEST_CLASS(test_utilities) { public: -#include "six/modules/c++/six.sicd/unittests/test_utilities.cpp" -}; - -TEST_CLASS(test_valid_six) { public: -#include "six/modules/c++/six.sicd/unittests/test_valid_six.cpp" -}; - -TEST_CLASS(test_valid_sixsicd) { public: -#include "six/modules/c++/six.sicd/unittests/test_valid_sixsicd.cpp" -}; - -} diff --git a/UnitTest/sicd_Test.h b/UnitTest/sicd_Test.h deleted file mode 100644 index 7e8f62082c..0000000000 --- a/UnitTest/sicd_Test.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "six_Test.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CppUnitTest.h" -#include "TestCase.h" \ No newline at end of file diff --git a/UnitTest/sidd.cpp b/UnitTest/sidd.cpp deleted file mode 100644 index 88f4691334..0000000000 --- a/UnitTest/sidd.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "pch.h" - -#include "sidd_Test.h" -#include "Test.h" - -namespace sidd -{ - -TEST_CLASS(test_annotations_equality) { public: -#include "six/modules/c++/six.sidd/unittests/test_annotations_equality.cpp" -}; - -TEST_CLASS(test_geometric_chip) { public: -#include "six/modules/c++/six.sidd/unittests/test_geometric_chip.cpp" -}; - -TEST_CLASS(test_read_sidd_legend) { public: - test_read_sidd_legend() - { - // initialization code here - const auto SIX_SCHEMA_PATH = six::Test::buildSchemaDir(); - sys::OS().setEnv("SIX_SCHEMA_PATH", SIX_SCHEMA_PATH.string(), true /*overwrite*/); - } - -#include "six/modules/c++/six.sidd/unittests/test_read_sidd_legend.cpp" -}; - -TEST_CLASS(unittest_sidd_byte_provider) { public: - unittest_sidd_byte_provider() - { - // initialization code here - const auto SIX_SCHEMA_PATH = six::Test::buildSchemaDir(); - sys::OS().setEnv("SIX_SCHEMA_PATH", SIX_SCHEMA_PATH.string(), true /*overwrite*/); - } - -#include "six/modules/c++/six.sidd/unittests/unittest_sidd_byte_provider.cpp" -}; - -TEST_CLASS(test_valid_sixsidd) { public: -#include "six/modules/c++/six.sidd/unittests/test_valid_sixsidd.cpp" -}; - -} \ No newline at end of file diff --git a/UnitTest/sidd_Test.h b/UnitTest/sidd_Test.h deleted file mode 100644 index 6db4d25458..0000000000 --- a/UnitTest/sidd_Test.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "six_Test.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "CppUnitTest.h" -#include "TestCase.h" \ No newline at end of file diff --git a/UnitTest/six.cpp b/UnitTest/six.cpp deleted file mode 100644 index 0ad48c2457..0000000000 --- a/UnitTest/six.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "pch.h" - -#include "six_Test.h" - -namespace six -{ - -TEST_CLASS(test_fft_sign_conversions) { public: -#include "six/modules/c++/six/unittests/test_fft_sign_conversions.cpp" -}; - -TEST_CLASS(test_polarization_type_conversions) { public: -#include "six/modules/c++/six/unittests/test_polarization_type_conversions.cpp" -}; - -TEST_CLASS(test_serialize) { public: -#include "six/modules/c++/six/unittests/test_serialize.cpp" -}; - -TEST_CLASS(test_xml_control) { public: -#include "six/modules/c++/six/unittests/test_xml_control.cpp" -}; - -} \ No newline at end of file diff --git a/UnitTest/six_Test.h b/UnitTest/six_Test.h deleted file mode 100644 index 5814a362f3..0000000000 --- a/UnitTest/six_Test.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include "six/XmlLite.h" -#include -#include -#include -#include - -#include "CppUnitTest.h" -#include "TestCase.h" - diff --git a/externals/nitro/cmake/nitroConfig.cmake.in b/cmake/nitroConfig.cmake.in similarity index 100% rename from externals/nitro/cmake/nitroConfig.cmake.in rename to cmake/nitroConfig.cmake.in diff --git a/cmake/six-libraryConfig.cmake.in b/cmake/six-libraryConfig.cmake.in deleted file mode 100644 index 71a058ee86..0000000000 --- a/cmake/six-libraryConfig.cmake.in +++ /dev/null @@ -1,9 +0,0 @@ -@PACKAGE_INIT@ - -# import coda-oss and nitro targets from their packages -include(CMakeFindDependencyMacro) -find_dependency(coda-oss) -find_dependency(nitro) - -# import six-library targets -include("${CMAKE_CURRENT_LIST_DIR}/six-libraryTargets.cmake") diff --git a/conanfile.py b/conanfile.py index 710777acd5..334722a312 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,30 +1,22 @@ +"""Conan recipe for building Nitro""" + from conans import ConanFile, CMake, tools import os import sys -class SixConan(ConanFile): - name = "six-library" - url = "https://github.com/ngageoint/six-library" - description = "library for reading and writing the Sensor Independent XML (SIX) format" +class NitroConan(ConanFile): + name = "nitro" + url = "https://github.com/mdaus/nitro" + description = "library for reading and writing the National Imagery Transmission Format (NITF)" settings = "os", "compiler", "build_type", "arch" - requires = ("coda-oss/master_67d6362bcfcf07e2", - "nitro/master_496bfba71889054c") - options = {"shared": [True, False], - "PYTHON_HOME": "ANY", - "PYTHON_VERSION": "ANY", - "ENABLE_PYTHON": [True, False], - } - default_options = {"shared": False, - "PYTHON_HOME": "", - "PYTHON_VERSION": "", - "ENABLE_PYTHON": True, - } + requires = ("coda-oss/master_1ac97fe4897896fd", ) + options = {"shared": [True, False]} + default_options = {"shared": False} exports_sources = ("CMakeLists.txt", "LICENSE", "README.md", "cmake/*", - "croppedNitfs/*", - "six/*", + "modules/*", ) generators = "cmake_paths" license = "GNU LESSER GENERAL PUBLIC LICENSE Version 3" @@ -40,17 +32,12 @@ class SixConan(ConanFile): def set_version(self): git = tools.Git(folder=self.recipe_folder) - self.version = "%s_%s" % (git.get_branch(), git.get_revision()[:16]) - - def configure(self): - # Python-related options are forced to be the same for dependencies - for dep in ['coda-oss', 'nitro']: - self.options[dep].PYTHON_HOME = self.options.PYTHON_HOME - self.options[dep].PYTHON_VERSION = self.options.PYTHON_VERSION - self.options[dep].ENABLE_PYTHON = self.options.ENABLE_PYTHON + self.version = git.get_revision()[:16] def _configure_cmake(self): cmake = CMake(self) + cmake.definitions["ENABLE_STATIC_TRES"] = True # always build static TRES + cmake.definitions["ENABLE_J2K"] = self.options["coda-oss"].ENABLE_J2K cmake.configure() return cmake diff --git a/copy_externals.csh b/copy_externals.csh index 436d51dc49..1674c143d1 100755 --- a/copy_externals.csh +++ b/copy_externals.csh @@ -4,15 +4,8 @@ rm -r -f tmp && mkdir tmp && cd tmp git clone --depth 1 -b main git@github.com:mdaus/coda-oss.git rm -r -f coda-oss/.git -git clone --depth 1 -b main git@github.com:mdaus/nitro.git -rm -r -f nitro/.git -rm -r -f nitro/externals - cd .. - rm -r -f externals/coda-oss mv tmp/coda-oss externals -rm -r -f externals/nitro -mv tmp/nitro externals - +rm -r -f externals/coda-oss/.git rmdir tmp diff --git a/croppedNitfs/SICD/cropped_sicd_040.nitf b/croppedNitfs/SICD/cropped_sicd_040.nitf deleted file mode 100644 index 0c1f5a7d0d..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_040.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_041.nitf b/croppedNitfs/SICD/cropped_sicd_041.nitf deleted file mode 100644 index a8e02c70ff..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_041.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_050.nitf b/croppedNitfs/SICD/cropped_sicd_050.nitf deleted file mode 100644 index 9b04afd825..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_050.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_100.nitf b/croppedNitfs/SICD/cropped_sicd_100.nitf deleted file mode 100644 index 83b524b873..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_100.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_101.nitf b/croppedNitfs/SICD/cropped_sicd_101.nitf deleted file mode 100644 index 3a1d230917..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_101.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_110.nitf b/croppedNitfs/SICD/cropped_sicd_110.nitf deleted file mode 100644 index 18cd5d8f99..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_110.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_120.nitf b/croppedNitfs/SICD/cropped_sicd_120.nitf deleted file mode 100644 index a98cdb7273..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_120.nitf and /dev/null differ diff --git a/croppedNitfs/SICD/cropped_sicd_extra_des.nitf b/croppedNitfs/SICD/cropped_sicd_extra_des.nitf deleted file mode 100644 index b6e1e42dd2..0000000000 Binary files a/croppedNitfs/SICD/cropped_sicd_extra_des.nitf and /dev/null differ diff --git a/croppedNitfs/SIDD/cropped_sidd.nitf b/croppedNitfs/SIDD/cropped_sidd.nitf deleted file mode 100644 index 959bdadc68..0000000000 Binary files a/croppedNitfs/SIDD/cropped_sidd.nitf and /dev/null differ diff --git a/docs/NGA.STND.0068-1_1.1.0_CPHD_DIDD_FINAL.pdf b/docs/NGA.STND.0068-1_1.1.0_CPHD_DIDD_FINAL.pdf deleted file mode 100644 index b68b1c4c9d..0000000000 Binary files a/docs/NGA.STND.0068-1_1.1.0_CPHD_DIDD_FINAL.pdf and /dev/null differ diff --git a/docs/SIDD_Design_Impl_DD_v1.0.0.pdf b/docs/SIDD_Design_Impl_DD_v1.0.0.pdf deleted file mode 100644 index 0879f7a18e..0000000000 Binary files a/docs/SIDD_Design_Impl_DD_v1.0.0.pdf and /dev/null differ diff --git a/docs/SIDD_GeoTIFF_File_Format_DD_v1.0.0.pdf b/docs/SIDD_GeoTIFF_File_Format_DD_v1.0.0.pdf deleted file mode 100644 index d6989e930a..0000000000 Binary files a/docs/SIDD_GeoTIFF_File_Format_DD_v1.0.0.pdf and /dev/null differ diff --git a/docs/SIDD_NITF_File_Format_DD_v1.0.0.pdf b/docs/SIDD_NITF_File_Format_DD_v1.0.0.pdf deleted file mode 100644 index 712723e001..0000000000 Binary files a/docs/SIDD_NITF_File_Format_DD_v1.0.0.pdf and /dev/null differ diff --git a/docs/impl/six-docbook.xml b/docs/impl/six-docbook.xml deleted file mode 100644 index c46b00fe65..0000000000 --- a/docs/impl/six-docbook.xml +++ /dev/null @@ -1,1239 +0,0 @@ - - -
- Reading & Writing Sensor Independent XML (2.1) - -
- About - - The Sensor Independent XML library (six), is a - cross-platform C++ API for reading and writing NGA's complex and derived - sensor independent radar formats. Additionally it is the official - reference implementation library for the Sensor Independent Derived Data - (SIDD) format. The library is intended to be easy to use and integrate, - without requiring extensive knowledge of XML or the underlying file - formats. File format implementation concerns are handled separately from - the data model, away from the end user. To create or read valid sensor - independent formats using this library, the application developer is only - concerned with populating the data model correctly. Reading and writing to - NITF, GeoTIFF and XML are handled by the library internally. This also - allows the library to be extended in the future to support new container - formats or specification enhancements. - - To facilitate extension and keep the code and coding mistakes to a - minimum, the library uses external open source libraries to handle file - format interactions. To minimize errors in application development, the - source incorporates some common C++ design patterns. However, to make the - system easy to use for researchers, the main components of the data model - are implemented purely as C-style structures. - - The six library is available as open-source - software under the Lesser GNU Public License (LGPL). This license is - commonly used in the open-source community, and allows applications that - are not open source to make use of the library without penalty. As with - other open source projects, the library is available as-is, with no - warranty. -
- -
- Downloading the Library - - The six library is currently distributed via - NGA's GitHub page, located at https://github.com/ngageoint/six-library. - The repository internally links to the MDA-IS - CODA-OSS and NITRO projects on - GitHub, using the git subtree merge strategy. - Several CODA-OSS modules are used as a portable - runtime, and NITRO is used to read and write NITF - files. When a user does a clone from the git repository, the CODA-OSS - and NITRO dependencies are already present as they have been merged - into the six repository itself. - - Stable source code releases, with release notes, are provided intermittently on the Releases page. - - The latest source code can be obtained via the Download Zip button on the main page. - - To clone the repository, a git client must be installed. On Unix, the git - command does the job. Execute the following command: - - $ git clone https://github.com/ngageoint/six-library.git -
- -
- Building and Installing the Library - - The library requires a C++ compiler. Most modern C++ compilers - should work. The library does make use of templates, exceptions, and - namespaces, so old or non-standards compliant compilers should be used - with caution. Refer to the table below for a listing of compilers and - architectures that the six library is known to build - on. - -
Architecture / Compiler Matrix - - - ArchitectureCompilers - - Windows XP 32-bitVisual Studio 2008, 2010, 2012 - Windows XP 64-bitVisual Studio 2008, 2010, 2012 - Linux 64-bit (x86_64)GNU compiler collection 4.1-4.4 - Linux 34-bitGNU compiler collection 4.1-4.4 - SolarisSUN Studio 10, 11, 12, 12.3 - Mac 64-bitGNU compiler collection 4.2.1 - - -
- -
- Building with - <emphasis>Waf</emphasis> - - The six library uses the - Waf build system to facilitate code compilation and - installation. Waf is a cross-platform Python tool that - enables developers to build the code in a standard way. - The version of Waf bundled with the codebase is a - custom modification of 1.7.14 and requires Python 2.7 or higher. - The most recent release of Python 2.x is recommended - (currently Python 2.7.10). - - In order to build on Windows, you will need a Visual - Studio Compiler installed. Microsoft Visual Studio C++ - Express Edition is freely available, and is what the - developers use to test six on Windows. To avoid - potential issues, we suggest using the Visual Studio command prompt that - comes bundled with the Visual Studio installation (it automatically - sources the appropriate vcvars32.bat file for you), though building - within a plain DOS shell (cmd.exe) without running this bat file - normally works as well. - - To build, first get a complete checkout. Tools such as TortoiseGit - make it easy to check out code from the repository on Windows. Once you - have a sandbox, and can run Python on your Windows machine, you are - ready to build from a DOS shell. The first step is to run waf - configure. The Waf program is a Python - script, and should either be run as an argument to Python, or you should - make sure that the python executable is in your - path. To verify you have a compliant version of Python installed, open - a command prompt / shell window and type the following: - - python --version - - The following listing shows an example scenario of configuring, - building, and installing the code. In this example we will be telling - Waf to install locally to a directory named - install and to use all the other default configure - flags. Below the example you will find a table that lists other - important configure-time flags you can use to customize your build. - - - >cd C:\dev\six - - >python waf configure --prefix=install -Setting top to : C:\dev\six -Setting out to : C:\dev\six\target -Platform : win32 -Checking for 'msvc' (c compiler) : C:\Program Files (x86)\Microsoft Visu -al Studio 11.0\VC\BIN\x86_amd64\CL.exe -Checking for 'msvc' (c++ compiler) : C:\Program Files (x86)\Microsoft Visu -al Studio 11.0\VC\BIN\x86_amd64\CL.exe -Checking for header inttypes.h : not found -Checking for header unistd.h : not found -Checking for header getopt.h : not found -Checking for header malloc.h : yes -Checking for header sys/time.h : not found -Checking for header limits.h : yes -Checking for header dlfcn.h : not found -Checking for header fcntl.h : yes -Checking for header check.h : not found -Checking for header memory.h : yes -Checking for header string.h : yes -Checking for header strings.h : not found -Checking for header stdbool.h : not found -Checking for header stdlib.h : yes -Checking for header stddef.h : yes -Checking for function localtime_r : not found -Checking for function gmtime_r : not found -Checking for function mmap : not found -Checking for function memmove : yes -Checking for function memset : yes -Checking for function strerror : yes -Checking for function bcopy : not found -Checking for type size_t : yes -Checking for type ssize_t : not found -Checking for const keyword : yes -Checking for unsigned short : yes -Checking for unsigned char : yes -Checking for library m : not found -Checking for library rt : not found -Checking for library sqrt : not found -Checking for function erf : not found -Checking for function erff : not found -Checking for function setenv : not found -Checking for function gettimeofday : not found -Checking for function clock_gettime : not found -Checking for function BSDgettimeofday : not found -Checking for function gethrtime : not found -Checking for function getpagesize : not found -Checking for function getopt : not found -Checking for function getopt_long : not found -Checking for function isnan : not found -Checking for type hrtime_t : not found -Checking system type sizes : yes -sizeof wchar_t : 2 -sizeof long_long : 8 -sizeof long : 4 -bigendian : False -sizeof size_t : 8 -sizeof double : 8 -sizeof short : 2 -sizeof int : 4 -sizeof float : 4 -Checking for 64-bit system : yes -System size : 64-bit -Checking for program matlab : C:\MATLAB\R2010a\bin\matlab.exe -Checking for header mex.h : yes -Checking for library libmex : yes -Checking for library libmx : yes -Checking for program python : C:\Python27\python.exe -Checking for python version : 2.7.2 -Checking for library python2.7 in $prefix/libs : not found -Checking for library python27 in $prefix/libs : yes -Checking for program C:\Python27\python.exe-config,python2.7-config,python-confi -g-2.7,python2.7m-config : not found -Checking for header Python.h - : yes -Can build python bindings - : yes -Configuring with XML layer - : xerces -Checking for library advapi32 - : yes -Checking for header netinet/in.h - : not found -Checking for header arpa/inet.h - : not found -Checking for header netdb.h - : not found -Checking for header intrin.h - : yes -Checking for header emmintrin.h - : yes -Checking for header wchar.h - : yes -Checking for header stdint.h - : yes -Checking for header stdio.h - : yes -Checking for header langinfo.h - : not found -Checking for header iconv.h - : not found -Checking for header nl_types.h - : not found -Checking for header ctype.h - : yes -Checking for header wctype.h - : yes -Checking for header cpuid.h - : not found -Checking for header endian.h - : not found -Checking for header machine/endian.h - : not found -Checking for header arpa/nameser_compat.h - : not found -Checking for header errno.h - : yes -Checking for header float.h - : yes -Checking for header locale.h - : yes -Checking for header sys/param.h - : not found -Checking for header sys/socket.h - : not found -Checking for header sys/stat.h - : yes -Checking for header sys/timeb.h - : yes -Checking for header sys/types.h - : yes -Checking for function mblen - : yes -Checking for function mbrlen - : not found -Checking for function mbsrtowcs - : not found -Checking for function mbstowcs - : yes -Checking for function wsctombs - : not found -Checking for function wcsrtombs - : not found -Checking for function realpath - : not found -Checking for function strchr - : yes -Checking for function strdup - : yes -Checking for function stricmp - : yes -Checking for function strnicmp - : yes -Checking for function strrcmp - : not found -Checking for function strstr - : yes -Checking for function strtol - : not found -Checking for function strtoul - : not found -Checking for function strcasecmp - : not found -Checking for function strncasecmp - : not found -Checking for function pathconf - : not found -Checking for function nl_langinfo - : not found -Checking for function iconv - : not found -Checking for function iconv_close - : not found -Checking for function iconv_open - : not found -Checking for function towupper - : yes -Checking for function towlower - : yes -Checking for function catclose - : not found -Checking for function catclose - : not found -Checking for function catgets - : not found -Checking for function catopen - : not found -Checking for function localeconv - : yes -Checking for function setlocale - : yes -Checking for function socket - : not found -Checking for function ftime - : yes -Checking for function getaddrinfo - : not found -Checking for library nsl - : not found -Building local lib - : xerces -Configuring with J2K layer - : openjpeg -Checking for function fseeko - : not found -Checking for header stdint.h - : yes -Checking for header sys/stat.h - : yes -Checking for header sys/types.h - : yes -Building local lib - : openjpeg -'configure' finished successfully (18.299s) - - - It is important to note that the configure step - should be run multiple times only if you need to modify the configuration variant. Most - of the time you will end up running the configure phase just - once, followed by one or more build/install phases - - Notable <emphasis>configure</emphasis> options - - - OptionHelp - - --prefixInstallation prefix (configuration) [default: '/usr/local/'] - --with-optz=OPTZSpecify the optimization level for optimized/release builds (med,fast,fastest) [default: 'fastest'] - --enable-debuggingEnable debugging - --enable-64bitEnables/forces 64bit builds [default: Will build 64-bit if compiler is available] - --enable-32bitEnables/forces 32bit builds - --with-defsSpecify custom macro definitions - --with-xml-homeSpecify pre-built Xerces 3.1.1 location [default: Built automatically] -
- - To see all available configure flags, use python waf --help. - - Once you have configured your build variant, the next step is to - build the code. You do this by running waf build or - just waf (they do the same thing). - - > python waf -... -... -'build' finished successfully (4m3.592s) - - - - The waf build process places build targets under their corresponding platform name in - the target directory. If you are developing code - in the codebase you can just use the binaries produced in this area rather than - installing each time. As an application developer you will likely want to install - the code to the prefix location you provided in the - configure step. To install the targets (libs, headers and sample apps) just - run waf install. - - > python waf install - - If you always want to install the libraries, you can skip - the waf build step and simply call - waf install. - - Unix builds look more or less the same. Most of the time on Unix, - it is not necessary to explicitly invoke python at - the beginning of the command (although it is possible). Here are the - commands run from a Linux box: - - $ ./waf configure --prefix=install -... -'configure' finished successfully (3.438s) -Waf: Leaving directory `/home/user/six-user/trunk/target' -$ ./waf -... -'build' finished successfully (32.147s) -$ ./waf install -... -'install' finished successfully (1.650s) - - - The Waf build system attempts to detect if it - is running on a 64-bit architecture and defaults the compile flags - accordingly. On some AMD chipsets, you may have to specify - --enable-64bit explicitly or you may get a - link-error between some of the compiled components. It is generally a - good idea to always force certain options you want control over. - - When running waf build or - waf install without a target list, it will build - all targets it can find which include a number of test programs that - may not be of interest to you. You can specify individual targets to - build at build/install time via the --target flag. - This is a comma-separated list of all targets you'd like to build. - Waf will automatically build any library dependencies - that are needed. After configuring, you can use - python waf list to list all available targets. - Here's an example of building just the SICD and SIDD libraries: - - > python waf install --target=six.sicd-c++,six.sidd-c++ - - After installing the library and its headers you will likely incorporate - its use into your own applications. We don't enforce the use of - Waf for your own applications so you can use whatever ways you - are already accustomed to. However, it's critical that you use the same - compiler defines that were used with Waf in order - to not create a mismatch in your application. After configuring, you - can get the compiler flags that Waf would use for a - given target or set of targets by running waf dumpenv - and listing the targets you're interested in. To do this for the SICD - and SIDD libraries: - - - > python waf dumpenv --target=six.sicd-c++,six.sidd-c++ - - - Keep in mind that many compilers/linkers require libs - to be listed in descending order, based on dependencies on one - another, so link order does matter. When building - an application, you can always use the -v flag in - order to see the exact compiler commands Waf is - using. - - In earlier versions of SIX, this was more involved, but SIX - now manages most of these for you by creating headers at configure time - that pertain to the current system. On all systems, you will want to - set _LARGEFILE_SOURCE and _FILE_OFFSET_BITS=64 (which your build system - may already be setting in order to support reading large files). On - Windows, you may need to also set _USE_MATH_DEFINES and NOMINMAX. Also - on Windows, you will need to set XERCES_STATIC_LIBRARY if you're using - Xerces or XML_STATIC if you're using Expat and OPJ_STATIC for OpenJPEG - (pertains to J2K compression in SIDD NITFs). - - After installation, there are two waf commands that allow for - packaging the library for distribution. To create a Python wheel in - the bin directory of your installation: - - - > python waf makewheel - -Creating wheel -Processing /home/user/six-user/six-library -Building wheels for collected packages: pysix - Running setup.py bdist_wheel for pysix - Stored in directory /home/user/six-user/six-library/install/bin -Successfully built pysix - - - A wheel is the standard format for distributing a Python module. It - contains all information needed to simply install and run. Any missing - depencies such as Numpy will automatically be installed as well. For - more information, see PEP 427. To install a wheel: - - - > pip install install/bin/*.whl - - - To convert the installation to a zip file: - - - > python waf package - -
- -
- Sample Programs - - There are several sample programs that have been developed to - demonstrate the six library in action. These samples - should serve as a good starting point for a developer looking to incorporate - the library into their own application. - - If you are not familiar with the SIO file format, - you can still use your own raw image files as sources for several of these samples. - Just modify the code to read the images using your own libraries and - then pass the buffers to the writer save() method. - -
- test_create_sidd_from_memory.cpp - This sample generates a SIDD NITF file by using imagery from memory - and combining it with a SICD XML file passed-in from the command line. You - can extract the XML from a SICD by using - test_extract_xml. -
-
- test_dump_images.cpp - This sample reads in a single SICD or SIDD file and dumps its images - as separate files. The program gives command line options for the following: - reading the entire image in-memory rather than one-line-at-a-time; - chipping out a ROI; writing the file as an SIO. -
-
- test_extract_xml.cpp - This sample uses the NITRO library and extracts the XML - contained in DES segments and writes them to separate files. -
-
- test_parse_xml.cpp - This sample parses the first XML DES from a SICD or SIDD NITF - file (or a passed-in XML file) and generates a KML of the image footprint. -
-
- test_round_trip.cpp - This sample shows how to use the six library to read a SICD or SIDD - file and then write it back to disk. -
-
- test_create_sicd.cpp - This sample shows how you can take an existing image file (in this case, an SIO) - and combine it with the SICD model data (in this case, fabricated) to - generate a SICD NITF product. Command line options allow you to override - the segmentation limitations to force image segmentation within the NITF. - -
-
- test_create_sidd.cpp - This sample shows how you can take an existing derived image file - (in this case, an SIO) along with a SICD XML file to generate a SIDD - NITF product. The SIDD model data is fabricated. -
-
- -
- Library Dependencies - - The XML handler library used by the library (called - xml.lite) is a lightweight implementation of a - simple Document Object Model (DOM) using one of several freely available - popular open source XML libraries as a driver. At build configuration - time, the developer can tell xml.lite to use - expat, Apache Xerces-C++, or - another library (check at configure time to see the latest - options). - - By default, six will use the - Xerces library to do XML parsing. This is the - recommended library to use as Expat does not support - schema validation. If the build system finds Xerces - on the target system and the --nobuild-xml configure - flag is used, it will attempt to use the installed version. If it does - not, it will attempt to build it from scratch from an internally bundled - driver the first time the library is built. If Xerces - already is installed on your system, you can use the - --with-xml-home option to set the proper include and - lib paths for the build system. To switch the xml library to the - Expat parser, use the - --enable-xml-layer=expat flag, optionally in - conjunction with the --with-xml-home path, - identifying the location of Expat, if it is not in - the sytem path. - - The NITRO library is MDA-IS software that - aims to be a complete implementation of the NITF MIL-STD2500C. It is - cross-platform, widely-used, and under active development and - maintenance. The NITRO C library is bundled - internally and automatically built on first use. - - The SIDD file format optionally does support GeoTIFF. It currently - uses the tiff module in CODA-OSS, which is a - minimalist implementation of the format. - - - It is likely that the library will support the standard - libtiff library as a driver in the future. - - -
- - -
- Library Design Idioms, Rules and Conventions - - While every attempt was made to keep the library minimalist, - supporting both SICD and SIDD in one library requires a fair amount of - code. To make it easy to maintain and use the library, certain idiomatic - coding conventions are used. This section attempts to document these - conventions and their rationale. - -
- Naming and Type Conventions - - Classes and structures follow Java style naming conventions. The - first letter is always upper case, and the class methods and fields - always begin with a lower case letter. Camel-casing is always used. - Fields in a class are primarily protected or private, and are prefixed - by an 'm', denoting that they are member fields. - Structure fields are always public scope and the fields are not prefixed - as they are in classes. Most types in the library have overloaded - methods to allow them to be printed as a string, or read in from - strings, using the str::toString() and - str::toType() methods . Basic primitives and - enumerations are used where possible to minimize the code base and to - provide a consistent API. Where these already exist in the - CODA-OSS runtime, they are reused. Types that are - taken from other CODA-OSS modules are often - typedef'ed within six, to - allow us to change their implementations in the future as - necessary. -
- -
- Data Model Conventions - - The library tries to implement the idea of Separation of Concerns - (SoC) -- the concept that an object should focus on only one thing and - do it well. This minimizes bugs and creates loose-coupling and strong - cohesion. With respect to the blocks described by SICD and SIDD, we keep - the object representation separate from the actions that transform it. - The former is called the "data model" and the latter are called "actors" - or "controls." To make things as simple as possible, C-style structures - are used to represent all of the components in the data model for SICD - and SIDD formats. This, theoretically, allows the actors to be extended - for other packaging mechanisms, but it also just makes it easier for an - application developer to write code. - - Most modern XML code-generation binding frameworks generate data - models that are tightly coupled with their XML representations. Here we - have made an explicit effort to separate the model from how it is - serialized. Certainly the XML reader and writer need to know what a - ComplexData object looks like, but in most cases, - that should be hidden from the application itself, and from the data - model itself. - - Additionally, most XML binding frameworks create objects that are - based on the names of the XMLSchema-defined types. This can be helpful - when dealing with schemas that have duplicate element names, and lots of - dependencies. The six library tries to keep the - data model closer to something that looks more like the XML instance, so - that the application developer does not have to thumb through the schema - every time looking for the type names. - - For example, one type in the SIDD schema is identified as - exploitationfeaturescollectionphenomenologytype, - but its single existing usage within SIDD is as a - Phenomenology element in the XML instance. A - typical binding library would generate an - exploitationfeaturescollectionphenomenologytype - structure, and the parent would have a pointer to a - phenomenology property, but that would mean that - any function that acts on the type would need to reference the type - name, not the instance name. We felt that it was less confusing for the - application to pass a Phenomenology structure - instead, and keep the property in the parent as - phenomenology as well, mirroring the name as it - appears in the actual XML data. - - - There are places in the data model where the property or class - name deviates slightly from the name as it appears in the XML - instance. These differences usually arise from the desire to keep a - consistent API. Each occurence is documented individually in the - doxygen comments along with the actual SICD or - SIDD element name. - -
- -
- Resource Initialization, Cloning and Destruction - - The data model root object is called Data, - and its sub-class implementations for SICD - (ComplexData) and SIDD - (DerivedData). The Data class - provides a minimal contract to its sub-classes, including some utility - methods to get information that is required for both derived classes, - but may live in different places in each objects XML representation. - Each derived Data class has pointers to its XML - blocks (top level elements). Every object underneath a derived - Data implementation is part of the data - model. - - Data model objects are initialized as soon as possible. This - usually means that if there are choices contained in the building of a - complex object, an enumeration will be passed to the constructor to tell - the object how to initialize. An object in the data model with a - required sub-field is required to allocate the sub-structure as soon as - it is created. Allocations for single objects are done using - new. C++ STL vectors are used to store unbounded - objects. Any objects contained in a vector that are pointers are also - allocated with the new keyword. If a required - sub-field has one or more elements, the library will initialize one - element in the sub-vector. - - Objects with optional types are not initialized in the - constructor. They are either set to a special undefined state or set to - NULL if they are pointers. Pointers are used for objects that have many - configuration details, or where an undefined state cannot be determined - without using NULL. A NULL-comparison is the only way to determine if a - pointer object is initialized in the library. Therefore, all - constructors must NULL-initialize any non-required pointers. An object - in the data model owns its sub-fields. It is expected to - delete them. If an application developer wishes to - own a copy of some object within a data model, it must create it from - scratch, or clone() it from an object in the model. - Optional and unbounded sub-fields are represented by an empty STL - vector. It is up to the application to provide optional elements by - inserting the into the vector as needed. - - Optional elements in the model should be allocated by the - application using the new keyword. Once its pointer - is assigned in the sub-field of a data model object, that object owns it - and will be responsible for deleting it. The caller should not - delete this optional element, unless it first sets - the parent's pointer field for that element back to NULL. The provided - ComplexDataBuilder and - DerivedDataBuilder objects will allow the - application to create any optional top-level blocks in a - Data object. - - All objects in the data model must provide a - clone() method. The clone() - method contract requires that the object make a deep copy of itself - (this is sometimes called a 'Prototype' design pattern). Prior to - cloning, any sub-field pointers are compared against NULL first. If a - sub-field object is NULL, the cloned object will also contain a NULL - sub-field. - - Since an object in the data model owns its own children, - destructors are required to test each pointer type against NULL, prior - to deletion. Non-NULL objects are freed using the - delete keyword. -
- -
- Actor Conventions and Patterns - - Actors (also referred to in the library as controls) are object - that perform an action on a data model. They are not part of the model - and are implemented as C++ classes. Most often, the developer encounters - these objects when reading or writing a file. Actors often define a - contractual interface, and sub-classes provide the implementation - wherever possible. The interface/implementation convention is more - flexible, and makes it easier to extend the library as necessary. For - example, the ReadControl interface defines the - contract for all SICD/SIDD read capabilities. To read a NITF, a - NITFReadControl sub-class would be created. To read - a GeoTIFF, the GeoTIFFReadControl sub-class is - used. The same is true for WriteControl's contract. - Actors can be new-allocated with a factory method, or created on the - stack if the implementation is known upfront. The example below shows - good encapsulation of WriteControl creation, where - the instantiation is separate from usage: - - // Trivial example of factory-type set-up for a WriteControl -void createWriter(std::string siddFile) -{ - six::WriteControl* writer = NULL; - - // This example uses NITRO, but we could just check the extension - if ( nitf::Reader::getNITFVersion(siddFile) == NITF_VER_UNKNOWN ) - { - writer = new six::NITFWriteControl(); - } - else - { - // Assume for this example it would be this otherwise - writer = new six::GeoTIFFWriteControl(); - } - return writer; -} - - - The XMLControl interface provides a contract - for serialization of a data model to and from a DOM, -- a standard - structure for XML manipulation. XMLControl may be - used independently from the ReadControl and - WriteControl, since its job is not to write a file, - but to change representations. Derived implementations exist for - DerivedData and ComplexData, - called DerivedXMLControl and - ComplexXMLControl, respectively. These can be - instantiated directly, or using the - XMLControlFactory if the Data - sub-class is not known by the caller. - - // ComplexData* data - -// Generically, from a Data* -six::XMLControl *genericControl = - six::XMLControlFactory::newXMLControl(data->getDataClass()); - -// Concretely if we know what Data type we have -xml::lite::Document* dom = six::ComplexXMLControl().toXML(data); - -// Or backwards -ComplexData* complexData = (ComplexData*) genericControl->fromXML(dom); - -// Dump DOM to standard out -io::StandardOutStream stream; -dom->getRootElement()->prettyPrint(stream); - -// Be a good citizen -delete dom; -delete genericControl; - - - Since the library takes care of XML automatically, the application - may never need to use an XMLControl directly, but - it is available if necessary. Utilities exist to convert the data model - directly into a byte array or std::string as well, without needing using - an XMLControl directly: - - char* charArray = six::toXMLCharArray(data); -std::string str = six::toXMLString(data); -... -// Be a good citizen -delete [] charArray; - - - The DerivedData object can be rigorously - created using pointer assignments in the model. Alternately, there is an - implementation of the 'Builder' design pattern built into the library - which can help. The builders for 2.0 do not allow the user to build - every single component in the data model. For details, consult the - doxygen: - - six::ComplexDataBuilder cdb; - -// Operators can be chained. Each function updates the model -cdb.addImageCreation().addImageData(six::RE32F_IM32F); - -// Get ownership over the builder's data -six::ComplexData* sicdData = cdb.steal(); - -// Add the complex data object to a SICD Container so we can write later -six::Container* container = new six::Container(six::TYPE_COMPLEX); -container->addData( sicdData ); - - -
-
- -
- TRE plugin path - Beginning with SICD/SIDD 1.0, the spec requires a user-defined subheader - (XML_DATA_CONTENT) to be present in the NITF's DES. six - populates this subheader automatically but it is implemented at the NITRO - layer via a plugin (which Waf builds automatically) - that you need to point six to. One way to do this is - via the environment variable NITF_PLUGIN_PATH. From the same directory - you built six in, on Windows: - - >set NITF_PLUGIN_PATH=%cd%\install\share\nitf\plugins - - On Unix (exact syntax may depend on your shell): - - $ setenv NITF_PLUGIN_PATH `pwd`/install/share/nitf/plugins - - Alternatively, you can do this in your program by calling six::loadPluginDir(). - Having this plugin path set is required when writing 1.0+ products (you - will get an error if the path is not set). It is not currently required - for reading but this may change in the future. - -
- -
- XML schema path - - six automatically performs schema validation when - reading and writing SICD/SIDD products. To do this, it needs the - corresponding schema files for each version. These are provided with - six and automatically installed by - Waf. One way to point six to - these is via the environment variable SIX_SCHEMA_PATH. From the same - directory you built six in, on Windows: - - >set SIX_SCHEMA_PATH=%cd%\install\conf\schema\six - - On Unix (exact syntax may depend on your shell): - - $ setenv SIX_SCHEMA_PATH `pwd`/install/conf/schema/six - - Alternatively, you can do this in your program by providing this - directory in the schemaPaths vector when calling - ReadControl::load() or WriteControl::save(). Providing this path via - one of these two mechanisms is required for both reading and writing (you - will get a validation error if the path is not set). - -
- -
- Using <emphasis>six</emphasis> to Read/Write Sensor Independent - Derived Data (SIDD) - - SIDD currently supports two file formats, NITF 2.1 and GeoTIFF, - typically referred to as "containers" in document jargon. The C++ - Container object models the file format container, - encapsulating one or more Data items in the order that they will be - written (or that they were read). A SIDD file stored in either of these - formats contains an XML meta-data section described by the SIDD XML - Schema. It is possible to use the six library to read - and write meta-data and imagery from either type of file, as well as to - load or store its meta-data to or from a raw XML document. - -
- Reading - - Reading is multi-pass. The library reads meta-data using - the load() function. To read image data, the - interleaved() function should be used. The name - alludes to the fact that multi-band data is read into a buffer in band - interleaved order, as opposed to providing the developer with a separate - buffer for each band. The latter method may be supported in the future - using another API call. - - The SICD file format only allows one SICD XML and image per file - format container (see the SICD File Format Design Document for details). - The SIDD format allows multiple SICD and SIDD XML data and multiple - derived images within a container (see the SIDD File Format Design - Document for details). The ReadControl's contract - is modeled in a way that it does not care whether the data is SICD or - SIDD. Currently, since SICD has only one defined official container - format, NITF, the NITFReadControl is the only - derived reader that can be used for SICD data. The - NITFReadControl and - GeoTIFFReadControl may be used to read SIDD data. - The interface does not change, irrespective of container format or - sensor data format. Here is an example of reading SICD meta-data from a - read control: - - // Create the reader -six::NITFReadControl reader; - -// Load the image, bind it to a container -reader.load("/path/to/sicd.nitf"); - -// Get the container -mem::SharedPtr<six::Container> c = reader.getContainer(); - -// Get the SICD data model -six::ComplexData* sicd = (six::ComplexData*)c->getData(0); - -// Read the number of rows using Data* base virtual method -std::cout << sicd->getNumRows() << std::endl; - -//-------------------------------------------------------------- -// Read the number of rows using ComplexData* structure -// Note this corresponds roughly to the XPath statement: -// /SICD/ImageData/NumRows -//-------------------------------------------------------------- -std::cout << sicd->imageData->numRows << std::endl; - - - - The same method can be used to read in SIDD - DerivedData. The SIDD specification allows the file - format container to include SICD XML about the collection, and one or - more SIDD sections as well. It is up to a "profile" to determine how - this data is ordered. For the purposes of our example, we will say that - the profile for this particular data specifies that there will be one - SIDD XML followed by its parent products' SICD XML. Since this is a - SIDD, it could be a NITF or a GeoTIFF, but lets imagine that the profile - only allows a NITF for this particular type of product: - - //-------------------------------------------------------------- -// This code does not rigorously check that the product -// actually matches its profile, it assumes that it is valid -//-------------------------------------------------------------- - -// Create the reader -six::NITFReadControl reader; - -// Load the image, bind it to a container -reader.load("/path/to/sidd.nitf"); - -// Get the container -mem::SharedPtr<six::Container> c = reader.getContainer(); - -// Get the SIDD data model (first data block) -six::DerivedData* sidd = (six::DerivedData*)c->getData(0); - -// Read the number of rows using Data* base virtual method -std::cout << sidd->getNumRows() << std::endl; - -//-------------------------------------------------------------- -// Read the number of rows using DerivedData* structure -// Note this corresponds roughly to XPath statement: -// /SIDD/Measurement/PixelFootprint/Row -//-------------------------------------------------------------- -std::cout << sicd->measurement->pixelFootprint.row << std::endl; - -// Get the SICD data model (second data block) -six::ComplexData* sicd = (six::ComplexData*)c->getData(1); -... - - - - Due to the details of the container formats, some differences - exist among derived ReadControls. In the case of - NITF, a single image segment size is limited to at most, around 10GB of - data. The TIFF file format itself is limited to 4GB in its entirety. To - circumvent the NITF issue, both SICD and SIDD file format documentations - define an algorithm for properly segmenting one continuous image into - multiple segments within the NITF. Since neither format uses TREs, this - is relatively straightforward as far as meta-data is concerned, but it - does require some book-keeping, and some updates to the NITF CCS. A goal - of the six library is to hide the details of the - file format container as much as possible. To that end, the library - hides segmentation rules from the application developer, and instead, - presents the developer with access to one virtual SICD image, - irrespective of how many segments exist in the NITF. With SIDD images, - each image may end up segmented (this is very unlikely to occur in - real-life scenarios), and each product is presented as a virtual SIDD - image, similar to the SICD usage. Therefore, the application developer - will have no need to access the NITF image segment data, since the XML - contains the meta-data for the full pixel array. - - SICD pixel arrays contain a band for real and a band for imaginary - data. The data is represented with each pixel made up of one real - component and one imaginary. In NITF jargon, this is called - 'band-interleaved by pixel.' SIDD 24-bit RGB pixel arrays are - interleaved the same way, where each pixel is organized one after - another as a byte of red, a byte of green, and a byte of blue, followed - by the next pixel. SIDD monochrome data and RGB 8-bit LUT data is - presented as a single band. In the latter case, the 8-bit value is an - index into the value: - - // Print a LUT for a given indexPixel -six::LUT* lut = sidd->display->remapInformation->remapLUT; -char* pixel = (*lut)[indexPixel]; -short r = (short)pixel[0]; -short g = (short)pixel[1]; -short b = (short)pixel[2]; -std::cout << "R,G,B: " << r << ',' << g << ','<< b << std"::endl; - - - - Reading interleaved data using a ReadControl - is done using a Region object, which specifies the - window to be read. The caller can allocate a buffer for reading, and - reuse it at a later point. Otherwise, the library will create a buffer - of the appropriate size, and give it back to the user. If the caller - allocates its own memory, it should be careful to ensure that it has - allocated the right amount prior to calling the - interleaved() function, in order to avoid memory corruption. - The requested window size is established in the - Region. If the numRows and - numCols are not set, or are set to -1, the - ReadControl will read from the start points up to - the end of the image into the buffer, and then sets the actual - numRows and numCols in the - region prior to returning: - - // Read one row at a time from a SICD container, and write to a file -Region region; -region.setNumRows(1); - -// Get the first data object -Data* sicdData = container->getData(0); - -// Allocate a one line buffer to read complex data -unsigned long nbpp = sicdData->getNumBytesPerPixel(); -unsigned long height = sicdData->getNumRows(); -unsigned long width = sicdData->getNumCols(); -unsigned long nbpr = nbpp * width; -workBuffer = new UByte[nbpr]; - -// Set it in the region -region.setBuffer(workBuffer); - -// Set up an output file -io::FileOutputStream outputStream(outputFile); - -// For each line in the image -for (unsigned int i = 0; i < height; i++) -{ - // Update the start row, other than that - // no need to modify region, we are okay - region.setStartRow(i); - UByte* line = reader->interleaved(region, 0); - outputStream.write((const sys::byte*) line, nbpr); -} -// Must delete our work buffer -delete [] workBuffer; -// Delete or ReadControl -delete reader; -// Close our output stream -outputStream.close(); - - It might be convenient in some cases to allow the library to - allocate enough memory for the request: - - // Read a chip out of the image -region.setStartRow(startRow); -region.setEndRow(endRow); -region.setStartCol(startCol); -region.setEndCol(endCol); - -std::complex<float>* chip = - (std::complex<float>*)reader->interleaved(region, 0); - -... - -// Still have to do this at the end -delete [] region.getBuffer(); - - -
- -
- Writing - - To write, the application developer will use the - WriteControl contract, using the appropriate - sub-class. It is important that the contents of the - Container be filled and organized in the order that - it is to be written in the file. There should be only one - Data inside a SICD Container, - and there will be only one image source passed into the - save() function. For SIDD Container's, all - meta-data will be written out, but the number of SIDD Data objects will - correspond one-to-one with the number of image sources provided to the - save() call. There are two types of image sources that the - WriteControl accepts. The first is a byte buffer. - This makes it easy to write an in-memory pixel array out to a SICD or - SIDD. The second method is via the io::InputStream - interface. In short, any class that derives - InputStream can be used as an image source for - writing, including io::FileInputStream, - io::StringStream, and any source that an application - developer can adapt to a stream. Creating a new InputStream - sub-class is trivial, since only two functions must be - overriden (one telling how many bytes are in the stream, and one to read - a specified number of bytes from the stream. The example below shows how - to write an unidentified stream into a SIDD image pixel array: - - //-------------------------------------------------------------- -// Assume the Container is properly set up -// and that we have two images in this SIDD product -// That means the container has two SIDD instance already -// Set up (perhaps some ComplexData as well -//-------------------------------------------------------------- - -// See create example above for pseudo-impl -WriteControl* writer = createWriter(file); - -// Set up the container. -writer.initialize(container); - -// We have a source for each image -std::vector<io::InputStream*> sources; - -//-------------------------------------------------------------- -// Some function to create a derived impl of InputStream -// Lets say this source function needs to know pixel array -// information contained in the DerivedData section -//-------------------------------------------------------------- -io::InputStream* is1 = - createInputSourceForProduct1(params, container->getData(0)); - -// Same type of function, but needs MD for SIDD data 1, not 0 -io::InputStream* is2 = - createInputSourceForProduct1(params, container->getData(1)); - -sources.push_back( is1 ); -sources.push_back( is2 ); - -// Save the file -writer->save(sources, outputName); - -// Delete the sources -for (unsigned int i = 0; i < sources.size(); ++i) - delete sources[i]; - - -
-
- -
- Getting Help and Reporting Bugs - - This library is provided as-is. This document is meant to help - developers, but when in doubt, the online Doxygen generated API - documentation or, if necessary, source code should be consulted. If you - fix a bug or make enhancements to this freely provided source code, the - LGPL requires that you submit your changes back to the copyright - holders. - - Software defects should be reported using the GitHub Issues page - (currently https://github.com/ngageoint/six-library/issues) - available at the current project hosting location. To post an issue, you - must login to GitHub first. When reporting a bug, try to be as specific as possible when - describing the problem. Please also provide sample code. If the code in - question is on a different network, or non-disclosable, please attempt to - make a short, concise example that would replicate the problem you are - seeing. We do not currently have an email group for help or discussion. -
- - - Build Alternatives - -
- Building on Windows within Visual Studio - - Waf supports the ability to generate a Visual - Studio 2010 solution file. After configuring, this can be done via - - >python waf msvs - - SIX support for this is still in a beta state - the main shortcoming of - the currently-generated solution file is that it contains projects for - each library and test program, including a large number of NITRO TRE - plugins that are not used by SIX. However, the six.sicd and six.sidd - projects inside this solution may still be useful. -
- - - diff --git a/docs/six-manual.pdf b/docs/six-manual.pdf deleted file mode 100644 index 2c02a932fd..0000000000 Binary files a/docs/six-manual.pdf and /dev/null differ diff --git a/docs/six_logo.png b/docs/six_logo.png deleted file mode 100644 index 38dc1979a2..0000000000 Binary files a/docs/six_logo.png and /dev/null differ diff --git a/externals/nitro/dot-github-workflows-macos.yml b/dot-github-workflows-macos.yml similarity index 100% rename from externals/nitro/dot-github-workflows-macos.yml rename to dot-github-workflows-macos.yml diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt deleted file mode 100644 index 8fa1207bd3..0000000000 --- a/externals/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# disable some unneeded coda-oss components -set(ENABLE_JARS OFF CACHE BOOL "" FORCE) -add_subdirectory("${CODA_OSS_DIR}") - -# six requires some static TREs from nitro, so we force enable them -set(ENABLE_STATIC_TRES ON CACHE BOOL "Build static libraries for each TRE" FORCE) -set(ENABLE_JAVA OFF CACHE BOOL "" FORCE) -set(ENABLE_MEX OFF CACHE BOOL "" FORCE) - -set(NITRO_DIR "nitro") -add_subdirectory("${NITRO_DIR}") diff --git a/externals/coda-oss/.github/workflows/build_unittest.yml b/externals/coda-oss/.github/workflows/build_unittest.yml index 109df279df..4490ff1940 100644 --- a/externals/coda-oss/.github/workflows/build_unittest.yml +++ b/externals/coda-oss/.github/workflows/build_unittest.yml @@ -11,9 +11,9 @@ jobs: name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install python dependencies @@ -63,7 +63,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout + - uses: actions/checkout@v3 - name: configure run: | ls env: @@ -76,7 +76,7 @@ jobs: cmake --build . --config ${{ matrix.configuration }} -j cmake --build . --config ${{ matrix.configuration }} --target install - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild + uses: microsoft/setup-msbuild@v1.0.2 # https://github.com/marketplace/actions/setup-msbuild with: msbuild-architecture: x64 - name: msbuild @@ -98,9 +98,9 @@ jobs: name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install python dependencies @@ -136,7 +136,7 @@ jobs: name: ${{ matrix.os }}-${{ matrix.configuration }}-${{ matrix.avx }}-CMake runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout + - uses: actions/checkout@v3 - name: configure run: | mkdir out && cd out @@ -161,9 +161,9 @@ jobs: name: ${{ matrix.os }}-${{ matrix.python-version }}-waf${{ matrix.debugging }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: configure_with_swig diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj b/externals/coda-oss/UnitTest/UnitTest.vcxproj index 19508e59c7..d79dab6f94 100644 --- a/externals/coda-oss/UnitTest/UnitTest.vcxproj +++ b/externals/coda-oss/UnitTest/UnitTest.vcxproj @@ -325,10 +325,6 @@ true true - - true - true - true true diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters b/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters index cd789e927d..f838a04336 100644 --- a/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters +++ b/externals/coda-oss/UnitTest/UnitTest.vcxproj.filters @@ -258,9 +258,6 @@ hdf5.lite - - sys - diff --git a/externals/coda-oss/UnitTest/sys.cpp b/externals/coda-oss/UnitTest/sys.cpp index 7bc8047070..7ac63c6a10 100644 --- a/externals/coda-oss/UnitTest/sys.cpp +++ b/externals/coda-oss/UnitTest/sys.cpp @@ -1,8 +1,6 @@ #include "pch.h" #include "CppUnitTest.h" -#include - #include #include #include @@ -23,7 +21,6 @@ #include #include #include -#include namespace sys { @@ -59,8 +56,4 @@ TEST_CLASS(test_path){ public: #include "sys/unittests/test_path.cpp" }; -TEST_CLASS(test_ximd){ public: -#include "sys/unittests/test_ximd.cpp" -}; - } \ No newline at end of file diff --git a/externals/coda-oss/modules/c++/coda-oss.vcxproj b/externals/coda-oss/modules/c++/coda-oss.vcxproj index 8b35965dfd..6aacf1781a 100644 --- a/externals/coda-oss/modules/c++/coda-oss.vcxproj +++ b/externals/coda-oss/modules/c++/coda-oss.vcxproj @@ -285,7 +285,6 @@ - diff --git a/externals/coda-oss/modules/c++/coda-oss.vcxproj.filters b/externals/coda-oss/modules/c++/coda-oss.vcxproj.filters index accaf020be..a94b8aafd1 100644 --- a/externals/coda-oss/modules/c++/coda-oss.vcxproj.filters +++ b/externals/coda-oss/modules/c++/coda-oss.vcxproj.filters @@ -957,9 +957,6 @@ coda_oss - - sys - diff --git a/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h b/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h index c93d5a9a4c..d5d91987bb 100644 --- a/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h +++ b/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h @@ -33,8 +33,6 @@ #include #include -#include "types/RowCol.h" - #include "H5_.h" #include "SpanRC.h" diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Ximd.h b/externals/coda-oss/modules/c++/sys/include/sys/Ximd.h deleted file mode 100644 index f9e0dcbf26..0000000000 --- a/externals/coda-oss/modules/c++/sys/include/sys/Ximd.h +++ /dev/null @@ -1,276 +0,0 @@ -/* ========================================================================= - * This file is part of sys-c++ - * ========================================================================= - * - * (C) Copyright 2004 - 2014, MDA Information Systems LLC - * Copyright 2024, Maxar Technologies, Inc. - * - * sys-c++ is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; If not, - * see . - * - */ - -#pragma once - -/*! - * \brief A simple (poor man's) "implemtation" of std::experimental::simd - * for development/testing purposes. - * - * `std::experimental::simd` needs G++11 and C++20 and the "vectorclass" - * library needs C++17. "Rolling our own" using `std::array` lets developers - * try out some things without needing actual SIMD code. - * - */ - -#include "Dbg.h" - -// This is intended for development/testing purposes, so enable by default only for debug. -#ifndef CODA_OSS_Ximd_ENABLED -#define CODA_OSS_Ximd_ENABLED CODA_OSS_DEBUG -#endif - -#if CODA_OSS_Ximd_ENABLED - -#include -#include -#include -#include - -namespace sys -{ -namespace ximd -{ - -// Need a class for the "broadcast" constructor (not impelemented). -// Also helps to avoid overloading `std::array`. -template -struct Ximd final -{ - static_assert(std::is_arithmetic::value, "T must be arithmetic"); - // static_assert(std::is_same::type>::value, "no `const` for T"); - - using value_type = T; - using reference = T&; - - Ximd() = default; - // This is the same as the "generater" overload below ... avoid enable_if gunk for now. - template - Ximd(U v) noexcept - { - *this = generate([&](size_t) { return v; }); - } - template - Ximd(const Ximd& other) noexcept - { - *this = other; - } - template - Ximd(const U* mem) - { - copy_from(mem); - } - - // https://en.cppreference.com/w/cpp/experimental/simd/simd/simd - // this is the same as `U&& v` above; avoid enable_if gunk for now. - template - static auto generate(G&& generator) noexcept - { - Ximd retval; - // This is where all the "magic" (would) happen. - for (size_t i = 0; i < size(); i++) - { - retval[i] = generator(i); - } - return retval; - } - template - explicit Ximd(G&& generator, nullptr_t) noexcept - { - *this = generate(generator); - } - - reference operator[](size_t pos) noexcept - { - return value[pos]; - } - value_type operator[](size_t pos) const noexcept - { - return value[pos]; - } - - static constexpr size_t size() noexcept - { - return N; - } - - template - void copy_from(const U* mem) - { - *this = Ximd::generate([&](size_t i) { return mem[i]; }); - } - template - void copy_to(U* mem) const - { - for (size_t i = 0; i < size(); i++) - { - mem[i] = (*this)[i]; - } - } - - Ximd& operator++() noexcept - { - *this = Ximd::generate([&](size_t i) { return ++value[i]; }); - return *this; - } - Ximd operator++(int) noexcept - { - auto tmp = *this; - ++(*this); - return tmp; - } - -private: - std::array value{}; -}; - -// template -// using fixed_size_ximd = Ximd; -// -// template -// using native_ximd = Ximd; - -using ximd_mask = Ximd; - -template -inline auto operator+(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return Ximd::generate([&](size_t i) { return lhs[i] + rhs[i]; }); -} -template -inline auto operator+(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs + Ximd(rhs); -} -template -inline auto operator-(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return Ximd::generate([&](size_t i) { return lhs[i] - rhs[i]; }); -} -template -inline auto operator-(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs - Ximd(rhs); -} -template -inline auto operator*(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return Ximd::generate([&](size_t i) { return lhs[i] * rhs[i]; }); -} -template -inline auto operator/(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs / Ximd(rhs); -} -template -inline auto operator/(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return Ximd::generate([&](size_t i) { return lhs[i] / rhs[i]; }); -} - -template -inline auto& operator+=(Ximd& lhs, const Ximd& rhs) noexcept -{ - lhs = lhs + rhs; - return lhs; -} -template -inline auto& operator-=(Ximd& lhs, const Ximd& rhs) noexcept -{ - lhs = lhs - rhs; - return lhs; -} - -template -inline auto operator==(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return ximd_mask::generate([&](size_t i) { return lhs[i] == rhs[i]; }); -} -template -inline auto operator==(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs == Ximd(rhs); -} -template -inline auto operator!=(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return ximd_mask::generate([&](size_t i) { return lhs[i] != rhs[i]; }); -} -template -inline auto operator!=(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs != Ximd(rhs); -} -template -inline auto operator<(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return ximd_mask::generate([&](size_t i) { return lhs[i] < rhs[i]; }); -} -template -inline auto operator<(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs < Ximd(rhs); -} -template -inline auto operator<=(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return ximd_mask::generate([&](size_t i) { return lhs[i] <= rhs[i]; }); -} -template -inline auto operator>(const Ximd& lhs, const Ximd& rhs) noexcept -{ - return ximd_mask::generate([&](size_t i) { return lhs[i] > rhs[i]; }); -} -template -inline auto operator>(const Ximd& lhs, typename Ximd::value_type rhs) noexcept -{ - return lhs > Ximd(rhs); -} - -inline bool any_of(const ximd_mask& m) -{ - for (size_t i = 0; i < m.size(); i++) - { - if (m[i]) - { - return true; - } - } - return false; -} - -template -inline auto atan2(const Ximd& real, const Ximd& imag) -{ - return Ximd::generate([&](size_t i) { return std::atan2(real[i], imag[i]); }); -} -template -inline auto round(const Ximd& v) -{ - return Ximd::generate([&](size_t i) { return std::round(v[i]); }); -} - -} // ximd -} // sys - -#endif diff --git a/externals/coda-oss/modules/c++/sys/unittests/test_ximd.cpp b/externals/coda-oss/modules/c++/sys/unittests/test_ximd.cpp deleted file mode 100644 index d419edca7e..0000000000 --- a/externals/coda-oss/modules/c++/sys/unittests/test_ximd.cpp +++ /dev/null @@ -1,573 +0,0 @@ -/* ========================================================================= - * This file is part of sys-c++ - * ========================================================================= - * - * (C) Copyright 2004 - 2014, MDA Information Systems LLC - * Copyright 2024, Maxar Technologies, Inc. - * - * sys-c++ is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; If not, - * see . - * - */ - -#include -#include -#include -#include - -// These are unittests, always enable unless explicitly disabled -#ifndef CODA_OSS_Ximd_ENABLED -#define CODA_OSS_Ximd_ENABLED 1 -#endif -#include - -#include -#include - -#include "TestCase.h" - -using zfloat = std::complex; - -template -using simd = sys::ximd::Ximd; -using intv = simd; -using floatv = simd; -using intv_mask = sys::ximd::ximd_mask; -using floatv_mask = sys::ximd::ximd_mask; - -// Manage a SIMD complex as an array of two SIMDs -using zfloatv = std::array; -static inline auto& real(zfloatv& z) noexcept -{ - return z[0]; -} -static inline const auto& real(const zfloatv& z) noexcept -{ - return z[0]; -} -static inline auto& imag(zfloatv& z) noexcept -{ - return z[1]; -} -static inline const auto& imag(const zfloatv& z) noexcept -{ - return z[1]; -} -static inline size_t size(const zfloatv& z) noexcept -{ - auto retval = real(z).size(); - assert(retval == imag(z).size()); - return retval; -} - -static inline auto arg(const zfloatv& z) -{ - // https://en.cppreference.com/w/cpp/numeric/complex/arg - // > `std::atan2(std::imag(z), std::real(z))` - return atan2(imag(z), real(z)); // arg() -} - -template -static inline auto make_zfloatv(TGeneratorReal&& generate_real, TGeneratorImag&& generate_imag) -{ - zfloatv retval; - for (size_t i = 0; i < size(retval); i++) - { - real(retval)[i] = generate_real(i); - imag(retval)[i] = generate_imag(i); - } - return retval; -} - -template -static inline auto copy_from(std::span p) -{ - simd retval; - assert(p.size() == retval.size()); - retval.copy_from(p.data()); - return retval; -} -static inline auto copy_from(std::span p) -{ - const auto generate_real = [&](size_t i) { return p[i].real(); }; - const auto generate_imag = [&](size_t i) { return p[i].imag(); }; - return make_zfloatv(generate_real, generate_imag); -} - -template -static inline auto copy_to(const simd& v) -{ - std::vector::value_type> retval(v.size()); - v.copy_to(retval.data()); - return retval; -} -static inline auto copy_to(const zfloatv& v) -{ - std::vector retval; - for (size_t i = 0; i < size(v); i++) - { - retval.emplace_back(real(v)[i], imag(v)[i]); - } - return retval; -} - -TEST_CASE(testDefaultConstructor) -{ - // sanity check implementation and utility routines - TEST_ASSERT_EQ(floatv::size(), size(zfloatv{})); - - // intv v = 1; - intv v; - v = 1; - for (size_t i = 0; i < v.size(); i++) - { - TEST_ASSERT_EQ(1, v[i]); - } -} - -// Sample code from SIX; see **ComplexToAMP8IPHS8I.cpp**. -static auto GetPhase(std::complex v) -{ - // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around - // handles cases that are close to 2PI. - double phase = std::arg(v); - if (phase < 0.0) phase += coda_oss::numbers::pi * 2.0; // Wrap from [0, 2PI] - return phase; -} -static uint8_t getPhase(zfloat v, float phase_delta) -{ - // Phase is determined via arithmetic because it's equally spaced. - const auto phase = GetPhase(v); - return gsl::narrow_cast(std::round(phase / phase_delta)); -} - -static inline auto if_add(const floatv_mask& m, const floatv& lhs, typename floatv::value_type rhs) -{ - const auto generate_add = [&](size_t i) { - return m[i] ? lhs[i] + rhs : lhs[i]; - }; - return floatv::generate(generate_add); -} -static inline auto roundi(const floatv& v) // match vcl::roundi() -{ - const auto rounded = round(v); - const auto generate_roundi = [&](size_t i) - { return static_cast(rounded[i]); }; - return intv::generate(generate_roundi); -} -static auto getPhase(const zfloatv& v, float phase_delta) -{ - // Phase is determined via arithmetic because it's equally spaced. - // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around - // handles cases that are close to 2PI. - auto phase = arg(v); - //where(phase < 0.0f, phase) += std::numbers::pi_v *2.0f; // Wrap from [0, 2PI] - phase = if_add(phase < 0.0f, phase, std::numbers::pi_v * 2.0f); // Wrap from [0, 2PI] - return roundi(phase / phase_delta); -} -static inline const auto& cxValues() -{ - //static const std::vector retval{/*{0, 0},*/ {1, 0}, {1, 1}, {0, 1}, {-1, 1}, {-1, 0}, {-1, -1}, {0, -1}, {1, -1}}; - static const std::vector retval{{0.0, 0.0}, {1.0, 1.0}, {10.0, -10.0}, {-100.0, 100.0}, {-1000.0, -1000.0}, // sample data from SIX - {-1.0, -1.0}, {1.0, -1.0}, {-1.0, 1.0} // "pad" to multiple of floatv::size() - }; - return retval; -} - -static auto expected_getPhase_values(const std::string& testName, float phase_delta) -{ - auto&& values = cxValues(); - TEST_ASSERT(values.size() % floatv::size() == 0); - std::vector expected; - for (auto&& v : values) - { - expected.push_back(getPhase(v, phase_delta)); - } - return expected; -} - -static auto toComplex_(double A, uint8_t phase) -{ - // The phase values should be read in (values 0 to 255) and converted to float by doing: - // P = (1 / 256) * input_value - const double P = (1.0 / 256.0) * phase; - - // To convert the amplitude and phase values to complex float (i.e. real and imaginary): - // S = A * cos(2 * pi * P) + j * A * sin(2 * pi * P) - const double angle = 2 * std::numbers::pi * P; - const auto sin_angle = sin(angle); - const auto cos_angle = cos(angle); - zfloat S(gsl::narrow_cast(A * cos_angle), gsl::narrow_cast(A * sin_angle)); - return S; -} -inline static auto toComplex(uint8_t amplitude, uint8_t phase) -{ - // A = input_amplitude(i.e. 0 to 255) - const double A = amplitude; - return toComplex_(A, phase); -} - -static auto phase_delta() -{ - static const auto p0 = GetPhase(toComplex(1, 0)); - static const auto p1 = GetPhase(toComplex(1, 1)); - assert(p0 == 0.0); - assert(p1 > p0); - static const auto retval = gsl::narrow_cast(p1 - p0); - return retval; -} - -static auto load(const std::vector& values) -{ - std::vector retval; - constexpr auto sz = floatv::size(); - auto const pValues = sys::make_span(values); - auto p = sys::make_span(pValues.data(), sz); - for (size_t i = 0; i < values.size() / sz; i++) - { - retval.push_back(copy_from(p)); - p = sys::make_span(p.data() + sz, p.size()); - } - return retval; -} - -TEST_CASE(testGetPhase) -{ - static const auto& expected = expected_getPhase_values(testName, phase_delta()); - - const auto valuesv = load(cxValues()); - std::vector actual; - for (auto&& zvaluev : valuesv) - { - const auto phase = getPhase(zvaluev, phase_delta()); - const auto phase_ = copy_to(phase); - for (auto&& ph : copy_to(phase)) - { - actual.push_back(gsl::narrow_cast(ph)); - } - } - - TEST_ASSERT_EQ(actual.size(), expected.size()); - for (size_t i = 0; i < actual.size(); i++) - { - TEST_ASSERT_EQ(actual[i], expected[i]); - } -} - -// Again, more sample code from SIX -static constexpr size_t AmplitudeTableSize = 256; -static auto getPhaseDirections_() -{ - //! Unit vector rays that represent each direction that phase can point. - std::array phase_directions; // interleaved, std::complex - - const auto p0 = GetPhase(toComplex(1, 0)); - for (size_t i = 0; i < AmplitudeTableSize; i++) - { - const float angle = static_cast(p0) + i * phase_delta(); - const auto y = sin(angle); - const auto x = cos(angle); - phase_directions[i] = {x, y}; - } - return phase_directions; -} -static inline const auto& getPhaseDirections() -{ - static const auto retval = getPhaseDirections_(); - return retval; -} - -template -static inline auto lookup(const intv& zindex, const std::array& phase_directions) -{ - const auto generate_real = [&](size_t i) - { - const auto i_ = zindex[i]; - return phase_directions[i_].real(); - }; - const auto generate_imag = [&](size_t i) - { - const auto i_ = zindex[i]; - return phase_directions[i_].imag(); - }; - return make_zfloatv(generate_real, generate_imag); -} - -TEST_CASE(testLookup) -{ - const auto& phase_directions = getPhaseDirections(); - - static const auto& expected_getPhase = expected_getPhase_values(testName, phase_delta()); - std::vector expected; - for (auto&& phase : expected_getPhase) - { - expected.push_back(phase_directions[phase]); - } - - const auto valuesv = load(cxValues()); - std::vector actual; - for (auto&& zvaluev : valuesv) - { - const auto phase = getPhase(zvaluev, phase_delta()); - const auto phase_direction = lookup(phase, phase_directions); - - for (auto&& pd : copy_to(phase_direction)) - { - actual.push_back(pd); - } - } - - TEST_ASSERT_EQ(actual.size(), expected.size()); - for (size_t i = 0; i < actual.size(); i++) - { - TEST_ASSERT_EQ(actual[i], expected[i]); - } -} - -// And ... more sample code from SIX -static auto iota_0_256_() -{ - static_assert(sizeof(size_t) > sizeof(uint8_t), "size_t can't hold UINT8_MAX!"); - - std::vector retval; - retval.reserve(UINT8_MAX + 1); - for (size_t i = 0; i <= UINT8_MAX; i++) // Be careful with indexing so that we don't wrap-around in the loop. - { - retval.push_back(gsl::narrow(i)); - } - assert(retval.size() == UINT8_MAX + 1); - return retval; -} -static inline std::vector iota_0_256() -{ - static const auto retval = iota_0_256_(); - return retval; -} - -static auto make_magnitudes_() -{ - std::vector result; - result.reserve(AmplitudeTableSize); - for (const auto amplitude : iota_0_256()) - { - // AmpPhase -> Complex - const auto phase = amplitude; - const auto complex = toComplex(amplitude, phase); - result.push_back(std::abs(complex)); - } - - // I don't know if we can guarantee that the amplitude table is non-decreasing. - // Check to verify property at runtime. - if (!std::is_sorted(result.begin(), result.end())) - { - throw std::runtime_error("magnitudes must be sorted"); - } - - std::array retval; - std::copy(result.begin(), result.end(), retval.begin()); - return retval; -} -static inline std::span magnitudes() -{ - //! The sorted set of possible magnitudes order from small to large. - static const auto cached_magnitudes = make_magnitudes_(); - return sys::make_span(cached_magnitudes); -} - -/*! - * Find the nearest element given an iterator range. - * @param value query value - * @return index of nearest value within the iterator range. - */ -static uint8_t nearest(std::span magnitudes, float value) -{ - const auto begin = magnitudes.begin(); - const auto end = magnitudes.end(); - - const auto it = std::lower_bound(begin, end, value); - if (it == begin) return 0; - - const auto prev_it = std::prev(it); - const auto nearest_it = it == end ? prev_it : - (value - *prev_it <= *it - value ? prev_it : it); - const auto distance = std::distance(begin, nearest_it); - assert(distance <= std::numeric_limits::max()); - return gsl::narrow(distance); -} -static uint8_t find_nearest(zfloat phase_direction, zfloat v) -{ - // We have to do a 1D nearest neighbor search for magnitude. - // But it's not the magnitude of the input complex value - it's the projection of - // the complex value onto the ray of candidate magnitudes at the selected phase. - // i.e. dot product. - const auto projection = (phase_direction.real() * v.real()) + (phase_direction.imag() * v.imag()); - //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? - return nearest(magnitudes(), projection); -} - -template -static inline auto select(const TTest& test, const TResult& t, const TResult& f) -{ - TResult retval; - for (size_t i = 0; i < test.size(); i++) - { - retval[i] = test[i] ? t[i] : f[i]; - } - return retval; -} - -static auto lookup(const intv& zindex, std::span magnitudes) -{ - const auto generate = [&](size_t i) { - const auto i_ = zindex[i]; - - // The index may be out of range. This is expected because `i` might be "don't care." - if ((i_ >= 0) && (i_ < std::ssize(magnitudes))) - { - return magnitudes[i_]; - } - return NAN; // propogate "don't care" - }; - return floatv::generate(generate); -} - -static inline auto lower_bound_(std::span magnitudes, const floatv& v) -{ - intv first; first = 0; - intv last; last = gsl::narrow(magnitudes.size()); - - auto count = last - first; - while (any_of(count > 0)) - { - auto it = first; - const auto step = count / 2; - it += step; - - auto next = it; ++next; // ... ++it; - auto advance = count; advance -= step + 1; // ... -= step + 1; - - const auto c = lookup(it, magnitudes); // magnituides[it] - - const auto test = c < v; // (c < v).__cvt(); // https://github.com/VcDevel/std-simd/issues/41 - - //where(test, it) = next; // ... ++it - //where(test, first) = it; // first = ... - //// count -= step + 1 <...OR...> count = step - //where(test, count) = advance; - //where(!test, count) = step; - it = select(test, next, it); // ... ++it - first = select(test, it, first); // first = ... - count = select(test, advance, step); // count -= step + 1 <...OR...> count = step - } - return first; -} -static inline auto lower_bound(std::span magnitudes, const floatv& value) -{ - return lower_bound_(magnitudes, value); -} - -static auto nearest(std::span magnitudes, const floatv& value) -{ - assert(magnitudes.size() == AmplitudeTableSize); - - /* - const auto it = std::lower_bound(begin, end, value); - if (it == begin) return 0; - - const auto prev_it = std::prev(it); - const auto nearest_it = it == end ? prev_it : - (value - *prev_it <= *it - value ? prev_it : it); - const auto distance = std::distance(begin, nearest_it); - assert(distance <= std::numeric_limits::max()); - return gsl::narrow(distance); - */ - const auto it = lower_bound(magnitudes, value); - const auto prev_it = it - 1; // const auto prev_it = std::prev(it); - - const auto v0 = value - lookup(prev_it, magnitudes); // value - *prev_it - const auto v1 = lookup(it, magnitudes) - value; // *it - value - //const auto nearest_it = select(v0 <= v1, prev_it, it); // (value - *prev_it <= *it - value ? prev_it : it); - - intv end; end = gsl::narrow(magnitudes.size()); - //const auto end_test = select(it == end, prev_it, nearest_it); // it == end ? prev_it : ... - intv zero; zero = 0; - auto retval = select(it == 0, zero, // if (it == begin) return 0; - select(it == end, prev_it, // it == end ? prev_it : ... - select(v0 <= v1, prev_it, it) // (value - *prev_it <= *it - value ? prev_it : it); - )); - return retval; -} - -static auto find_nearest(std::span magnitudes, const floatv& phase_direction_real, const floatv& phase_direction_imag, - const zfloatv& v) -{ - // We have to do a 1D nearest neighbor search for magnitude. - // But it's not the magnitude of the input complex value - it's the projection of - // the complex value onto the ray of candidate magnitudes at the selected phase. - // i.e. dot product. - const auto projection = (phase_direction_real * real(v)) + (phase_direction_imag * imag(v)); - //assert(std::abs(projection - std::abs(v)) < 1e-5); // TODO ??? - return nearest(magnitudes, projection); -} -static inline auto find_nearest(std::span magnitudes, const zfloatv& phase_direction, const zfloatv& v) -{ - return find_nearest(magnitudes, real(phase_direction), imag(phase_direction), v); -} - -TEST_CASE(testFindNearest) -{ - const auto& values = cxValues(); - const auto& phase_directions = getPhaseDirections(); - - static const auto& expected_getPhase = expected_getPhase_values(testName, phase_delta()); - std::vector expected_phase_directions; - for (auto&& phase : expected_getPhase) - { - expected_phase_directions.push_back(phase_directions[phase]); - } - std::vector expected; - for (size_t i = 0; i < values.size(); i++) - { - auto a = find_nearest(expected_phase_directions[i], values[i]); - expected.push_back(a); - } - - const auto valuesv = load(cxValues()); - std::vector actual; - for (auto&& v : valuesv) - { - const auto phase = getPhase(v, phase_delta()); - const auto phase_direction = lookup(phase, phase_directions); - const auto amplitude = find_nearest(magnitudes(), phase_direction, v); - - for (auto&& a : copy_to(amplitude)) - { - actual.push_back(static_cast(a)); - } - } - - TEST_ASSERT_EQ(actual.size(), expected.size()); - for (size_t i = 0; i < actual.size(); i++) - { - TEST_ASSERT_EQ(actual[i], expected[i]); - } -} - -TEST_MAIN( - TEST_CHECK(testDefaultConstructor); - - TEST_CHECK(testGetPhase); - TEST_CHECK(testLookup); - TEST_CHECK(testFindNearest); -) diff --git a/externals/nitro/.gitattributes b/externals/nitro/.gitattributes deleted file mode 100644 index c888454a3c..0000000000 --- a/externals/nitro/.gitattributes +++ /dev/null @@ -1,99 +0,0 @@ -# prevent git from changing line endings for conan recipes and CMake files, -# since they are hashed to produce a conan recipe revision ID -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/externals/nitro/.github/workflows/codeql.yml b/externals/nitro/.github/workflows/codeql.yml deleted file mode 100644 index f564eba155..0000000000 --- a/externals/nitro/.github/workflows/codeql.yml +++ /dev/null @@ -1,80 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - schedule: - - cron: '35 17 * * 6' - -jobs: - analyze: - name: Analyze - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners - # Consider using larger runners for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'c-cpp' ] - # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] - # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - category: "/language:${{matrix.language}}" diff --git a/externals/nitro/.github/workflows/frequent_check.yml b/externals/nitro/.github/workflows/frequent_check.yml deleted file mode 100644 index 44916acd57..0000000000 --- a/externals/nitro/.github/workflows/frequent_check.yml +++ /dev/null @@ -1,109 +0,0 @@ -name: Build, unittest - -on: [push] - - -jobs: - build-cmake-windows: - strategy: - matrix: - os: [windows-latest] - platform: [x64] - configuration: [Release] - name: ${{ matrix.os }}-CMake - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout - - name: Set up Python - uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python - with: - python-version: '3.7' - - name: configure - run: | - mkdir out - cd out - cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7" - - name: make - run: | - cd out - cmake --build . --config ${{ matrix.configuration }} -j - cmake --build . --config ${{ matrix.configuration }} --target install - - name: test - run: | - cd out - ctest -C ${{ matrix.configuration }} --output-on-failure - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 # 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@v4 # https://github.com/marketplace/actions/checkout - - 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.1 # 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/vstest-action@v1.0.0 # 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-cmake: - strategy: - matrix: - os: [ubuntu-latest] - name: ${{ matrix.os }}-CMake - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout - - name: Set up Python - uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python - with: - python-version: '3.7' - - name: configure - run: | - mkdir target-Release - cd target-Release - cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7 - - name: make - run: | - 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 target-Release - ctest --output-on-failure diff --git a/externals/nitro/.gitignore b/externals/nitro/.gitignore deleted file mode 100644 index 5d75601512..0000000000 --- a/externals/nitro/.gitignore +++ /dev/null @@ -1,51 +0,0 @@ -# Waf -.lock-waf* -.waf-* - -# CMake -out/ -_deps/ -CMakeFiles/ -CMakeCache.txt -CMakeSettings.json -# ignore build directories ... -build/ -# ... but not coda-oss/build -!/externals/coda-oss/build/ - -externals/coda-oss/modules/c++/**/Makefile -modules/**/Makefile - -# Build artifacts -target/ -install/ -**/install-*/ -test_package/build/ -*.pyc -*.swp -.depproj -.vs -*.vcxproj.user -**/Debug/ -**/Release/ -packages/ -*.so* -*.a - -# Drivers -modules/c/j2k/external/openjpeg/openjpeg-2.0.0/ -modules/c/j2k/external/jasper/jasper-1.900.1-mod/ -.DS_Store - -Makefile -doc/build -bin/ -test/unit/CMakeScripts/ -libnitf.pc - -.idea/ -cmake-build*/ - -# unit tests -outputPathname.ntf -sicd_*_nitf__*_band_*.man diff --git a/externals/nitro/CMakeLists.txt b/externals/nitro/CMakeLists.txt deleted file mode 100644 index 6bd74b7352..0000000000 --- a/externals/nitro/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(nitro) - -set(CMAKE_CXX_STANDARD 14) -set(CXX_STANDARD_REQUIRED true) - -if (${CMAKE_PROJECT_NAME} STREQUAL nitro) - # we are the top-level project and are responsible for configuration - - # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output; - # we'll dial-back warnings as necessary. - if (MSVC) - add_compile_options(/WX) # warnings as errors - add_compile_options(/MP) # multi-processor compile - - if (ENABLE_ASAN) - # https://docs.microsoft.com/en-us/cpp/sanitizers/asan?view=msvc-160 - add_compile_options(/fsanitize=address) - endif() - - elseif (UNIX) - add_compile_options(-Werror) # warnings as errors - - if (ENABLE_ASAN) - # https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html - add_compile_options(-fsanitize=address) - add_link_options(-fsanitize=address) - endif() - endif() - - if (EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake") - # use pre-built coda-oss from conan package - include("${CMAKE_BINARY_DIR}/conan_paths.cmake") - find_package(coda-oss REQUIRED) - include(CodaBuild) - coda_initialize_build() - else() - # build coda-oss ourselves - set(CODA_OSS_DIR "coda-oss") - list(APPEND CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/externals/${CODA_OSS_DIR}/cmake") - include(CodaBuild) - coda_initialize_build() - add_subdirectory("externals/${CODA_OSS_DIR}") - endif() -endif() - -set(NITRO_C_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/c) -add_subdirectory("modules") - -coda_generate_package_config() diff --git a/externals/nitro/LICENSE b/externals/nitro/LICENSE deleted file mode 100644 index 65c5ca88a6..0000000000 --- a/externals/nitro/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/externals/nitro/README.md b/externals/nitro/README.md deleted file mode 100644 index 66cda289ec..0000000000 --- a/externals/nitro/README.md +++ /dev/null @@ -1,245 +0,0 @@ -Building NITRO ---------------- - -CMake is the preferred build method. Version 3.14 or better is required. - -Sample Build Scenario ---------------------- - - mkdir build - cd build - cmake .. - cmake --build . -j - cmake --build . --target install - ctest - -Problems and Configurations ---------------------------- - - If your system compiler does not fully support C++11, you may have to - specify a different one during the configure step. e.g. - - cmake -DCMAKE_C_COMPILER=/some/path/gcc/4.9.1/bin/gcc -DCMAKE_CXX_COMPILER=/...../bin/g++ .. - - - Pass -DCMAKE_INSTALL_PREFIX to set the install location. - - - Python and C++ bindings are built. Just make sure the relevant tools - are on your PATH. Java and MATLAB bindings are now in the **archive** directory - and no longer built. - - - See the [coda-oss CMake build README](externals/coda-oss/cmake/README.md) - for further build configuration information, particularly for Python-related - details. The same options there may be passed to Nitro. - - - Build types `Release`, `RelWithDebInfo`, and `Debug` may be chosen - - On Linux, debug symbols are available by default (`RelWithDebInfo`). Configure build type with [-DCMAKE_BUILD_TYPE](https://cmake.org/cmake/help/v3.0/variable/CMAKE_BUILD_TYPE.html) - - On Windows, release type should be configured during the build and install steps - - cmake --build . --config Release -j - cmake --build . --config Release --target install - The CMake default build type `Debug` may not work with Python, unless the Python installation includes debug versions of the Python libraries. - - Regenerating python bindings - - Currently, cmake configuration for regenerating swig bindings is incomplete and use of `waf` is required. - - The `.regenerate_python_bindings.py` script is wrapper around `waf` can be run to quickly update these files. - - python3 .regenerate_python_bindings.py - DEBUG_PY_BINDINGS=1 python3 .regenerate_python_bindings.py # see all details - - This is typically required when project dependencies (e.g. CODA-OSS) are updated. - - - If the CMake build system does not support a required feature that Waf does, create - an issue or a pull request! - - -Building with Waf ------------------ -Waf is the legacy build system. Below are all of the options available. - - - > python waf --help - waf [command] [options] - - Main commands (example: ./waf build -j4) - build : builds the project - clean : removes the build files - configure: configures the project - dist : makes a tarball for redistributing the sources - distcheck: checks if the sources compile (tarball from 'dist') - install : installs the build files - uninstall: removes the installed files - - Options: - --version show program's version number and exit - -h, --help show this help message and exit - -j JOBS, --jobs=JOBS amount of parallel jobs (8) - -k, --keep keep running happily on independent task groups - -v, --verbose verbosity level -v -vv or -vvv [default: 0] - --nocache ignore the WAFCACHE (if set) - --zones=ZONES debugging zones (task_gen, deps, tasks, etc) - -p, --progress -p: progress bar; -pp: ide output - --targets=COMPILE_TARGETS - build given task generators, e.g. "target1,target2" - --enable-warnings Enable warnings - --enable-debugging Enable debugging - --enable-64bit Enable 64bit builds - --enable-doxygen Enable running doxygen - --with-cflags=FLAGS Set non-standard CFLAGS - --with-cxxflags=FLAGS - Set non-standard CXXFLAGS (C++) - --with-defs=DEFS Use DEFS as macro definitions - --with-optz=OPTZ Specify the optimization level for optimized/release builds - --libs-only Only build the libs (skip building the tests, etc.) - --shared Build all libs as shared libs - --disable-symlinks Disable creating symlinks for libs - --disable-java Disable java (default) - --with-java-home=JAVA_HOME - Specify the location of the java home - --require-java Require Java lib/headers (configure option) - --nopyc Do not install bytecode compiled .pyc files (configuration) [Default:install] - --nopyo Do not install optimised compiled .pyo files (configuration) [Default:install] - --disable-python Disable python - --require-python Require Python lib/headers (configure option) - --enable-openjpeg Enable openjpeg - - configuration options: - -b BLDDIR, --blddir=BLDDIR - build dir for the project (configuration) - -s SRCDIR, --srcdir=SRCDIR - src dir for the project (configuration) - --prefix=PREFIX installation prefix (configuration) [default: '/usr/local/'] - - installation options: - --destdir=DESTDIR installation root [default: ''] - -f, --force force file installation - - C Compiler Options: - --check-c-compiler=CHECK_C_COMPILER - On this platform (linux) the following C-Compiler will be checked by default: "gcc icc suncc" - - C++ Compiler Options: - --check-cxx-compiler=CHECK_CXX_COMPILER - On this platform (linux) the following C++ Compiler will be checked by default: "g++ icpc - sunc++" - - - -Sample Build Scenario ---------------------- - > python waf configure --enable-debugging --prefix=installed - > python waf build - > python waf install - - -Enabling a debugger -------------------- -`-g` and its variants can be achieved at configure time using the -`--enable-debugging` switch at waf configure time - -Memory Debugging ----------------- -To ease debugging and memory leak detection, macros are used -to malloc, realloc and free information. -`NITF_MALLOC()`, `NITF_REALLOC()`, and `NITF_FREE()` should be used -instead of the stdlib.h functions. - -If you defined `NITF_DEBUG` during compilation -(using configure, give the argument `--with-defs="-DNITF_DEBUG"` -and this will occur automatically), you will get -an memory image information dump every time you run an executable, -named `memory_trace.` where `` is the PID of the process -you just ran. There is a verification tool located in -nitf/tests/verify, called `mem_sane.pl`. If you run `mem_sane.pl` -with the memory trace as the single argument, you will get a -formatted output of all memory that is questionably allocated -or deallocated in the nitf library's calls. Please, please, please -check your stuff. - -C Conventions -------------- -In order to keep the C code easy to program and debug, and -above all, OO, we stick to certain conventions herein: - -* All constructors must be passed an error - On failure, they return `NULL`, and populate the error - -* All destructors must `NULL` set the object after they - are done deleting, and should check the object prior, - to make sure that it has not been deleted already. - This means, of course, that all destructors take a pointer - to the object. In practice, usually most of these, then, - take double pointers (where usually you pass it a pointer - by address) - -* All objects are in structs with an underscore in front of - their name, and a typedef to the real name (.e.g., - `struct _nitf_PluginRegistry` => `nitf_PluginRegistry`) - -* All functions that are non-static should be wrapped in - a `NITFAPI(return-val)` or `NITFPROT(return-val)` for protected - data. - -* This allows for easy macro definitions in order to - control the decoration algorithm for windows, and to assure - that the import decoration and - export decoration are identical (otherwise we cant use them) - -* IMPORTANT: The difference between `NITFAPI()` and `NITFPROT()` - is that the C++ code binding generator exposes API() calls - and ignores PROT() calls. - -* All enumerations and constants have a NITF/NITF20/NITF21 - prefix. Along these lines, all functions and objects - are prefixed with a 'namespace' (nitf/nitf20/nitf21). - -Platforms ---------- -While the ultimate goal is to be cross-platform and cross-language, -the C and C++ layers get the most support. - -The Python layer gets some use for scripting convenience. - -The MATLAB and JAVA layers have not been touched in years; they are -no longer built, code remains in the **archive** directory. - -TREs need to be coded in C (only). - -Before you commit ------------------ -* Create a unit test for your all code you - are adding - -* Compile and test. (`ctest`) - -* A clang-format script is available at `externals/coda-oss/.clang-format`. - Use it. - -* Doxygen on root directory and view in - browser the doxygen code (in nitf/doc/html/). - -Doxygen Commenting ------------------- -Please make an effort to write doxygen comments. I know, -especially in C, that doxygen has some issues. However, -its the best, cheapest thing we have, and its important -to have the APIs documented. It will save me the trouble -of fixing it later, which will make me eternally grateful. - - -NITF Library Users: General Issues ----------------------------------- -NITRO handles TREs by loading dynamic libraries at runtime. Therefore, you need -to make sure NITRO can find them. - -* If you are building from source, the location will be compiled in, and - you don't have to do anything extra. - -* If you are working from a binary release, you will have to tell - NITRO where the plugins are by setting the `NITF_PLUGIN_PATH` - enviornment variable. - This should look something like `/share/nitf/plugins`. - -* If you wish to use a custom TRE location, you can also specify that - with `NITF_PLUGIN_PATH`. - -Contact ---------- - -February 2022, Dan Smith Maxar diff --git a/externals/nitro/ReleaseNotes.md b/externals/nitro/ReleaseNotes.md deleted file mode 100644 index 7111a792e9..0000000000 --- a/externals/nitro/ReleaseNotes.md +++ /dev/null @@ -1,68 +0,0 @@ -# NITRO (NITF i/o) Release Notes - -## [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. - -## [Version 2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4); August 18 5, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) -* Added **.gitattributes** and normalized line-endings (`\n` for most text files). - -## [Version 2.11.3](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.3); June 5, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05) -* Fix display of [certain TREs](https://github.com/mdaus/nitro/issues/529). -* Adjust compiler flags for clean *CMake* builds. -* Implement `DecompressionInterface::adapterFreeBlock()` to fix decompression. - -## [Version 2.11.2](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.2); December 14, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14) -* Further work at getting unittests to work better when included elsewhere (e.g., SIX) as **externals**. - -## [Version 2.11.1](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.1); November 4, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04) -* fixed incorrect field sizes in the CSEXRB TRE. -* make unittests work better when included elsewhere (e.g., SIX) as **externals**. -* remove exception specifications -* `tarfile.extractall()` sanitization - -## [Version 2.11.0](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.0); August 30, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14) -* Cut from [main](https://github.com/mdaus/nitro/tree/main); identical to [Version 2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12) -except that C++14 is now required. [master](https://github.com/mdaus/nitro/tree/master) remains at C++11. - -## [Version 2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12); August 30, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30) -* Build JPEG decompression as a plug-in. -* tweak unittests so they run in SIX. -* ~~Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/mdaus/nitro/tree/main).~~ - -## [Version 2.10.11](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.11); August 2, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-02](https://github.com/mdaus/coda-oss/releases/tag/2022-08-02) -* remove more compiler warnings - -## [Version 2.10.10](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.10); June 29, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-06-29](https://github.com/mdaus/coda-oss/releases/tag/2022-06-29) - -## [Version 2.10.9](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.9); May 3, 2022 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-05-03](https://github.com/mdaus/coda-oss/releases/tag/2022-05-03) -* the large unused **archive** directory has been removed; contents are in [archive/java](https://github.com/mdaus/nitro/tree/archive/java) -and [archive/mex](https://github.com/mdaus/nitro/tree/archive/mex). -* the large unused **docs** directory has been removed; contents are in [archive/docs](https://github.com/mdaus/nitro/tree/archive/docs). -* Copy the J2K wrappers from **coda**. - -## [Version 2.10.8](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.8); February 22, 2022 (aka 2/22/22) -* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-02-22](https://github.com/mdaus/coda-oss/releases/tag/2022-02-22) -* Show how to use [strongly typed TREs](https://github.com/mdaus/nitro/tree/feature/strongly-typed-TREs). -* Infrastucture to support "[reflection](https://github.com/mdaus/nitro/tree/feature/reflection)" over C `struct`s. -* Begin C++ wrappers for the C *j2k* routines; work-in-progress. - -## [Version 2.10.7](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.7); December 13, 2021 -* [coda-oss](https://github.com/mdaus/coda-oss) release [2021-12-13](https://github.com/mdaus/coda-oss/releases/tag/2021-12-13) -* allow `NITF_PLUGIN_PATH` warning to be turned off -* tweaks to compile with older C++11 compilers -* build with Visual Studio 2022 - ------ - -## Contact -February 2022, Dan Smith Maxar \ No newline at end of file diff --git a/externals/nitro/UnitTest/CppUnitTestAssert.cpp b/externals/nitro/UnitTest/CppUnitTestAssert.cpp deleted file mode 100644 index 13b75386ac..0000000000 --- a/externals/nitro/UnitTest/CppUnitTestAssert.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "pch.h" -#include "TestCase.h" - -// Can't get this to build in the **coda-oss** project. -#include "sys/source/CppUnitTestAssert_.cpp_" diff --git a/externals/nitro/UnitTest/Test.h b/externals/nitro/UnitTest/Test.h deleted file mode 100644 index a9ac754ab4..0000000000 --- a/externals/nitro/UnitTest/Test.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include "nitf/unittests/Test.h" -#include "TestCase.h" - -#define TEST_ASSERT_EQ_INT(X1, X2) TEST_ASSERT_EQ(X2, X1) -#define TEST_ASSERT_EQ_STR(X1, X2) TEST_ASSERT_EQ(std::string(X1), std::string(X2)) -#define TEST_ASSERT_EQ_FLOAT(X1, X2) TEST_ASSERT_EQ(static_cast(X1), static_cast(X2)) \ No newline at end of file diff --git a/externals/nitro/UnitTest/TestCase.h b/externals/nitro/UnitTest/TestCase.h deleted file mode 100644 index 2c8a470500..0000000000 --- a/externals/nitro/UnitTest/TestCase.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#undef TEST_ASSERT_NULL -#undef TEST_ASSERT -#undef TEST_ASSERT_ALMOST_EQ -#undef TEST_ASSERT_EQ -#include diff --git a/externals/nitro/UnitTest/UnitTest.vcxproj b/externals/nitro/UnitTest/UnitTest.vcxproj deleted file mode 100644 index 547527c2ab..0000000000 --- a/externals/nitro/UnitTest/UnitTest.vcxproj +++ /dev/null @@ -1,270 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 17.0 - {8ACE478C-8F6F-4D42-9B43-7D75882D4BE1} - Win32Proj - UnitTest - 10.0 - NativeUnitTestProject - - - - DynamicLibrary - true - v143 - Unicode - false - - - DynamicLibrary - false - v143 - true - Unicode - false - - - - - - - - - - - - - - - true - - - false - - - - Use - Level4 - true - $(ProjectDir);$(SolutionDir)modules\c\nrt\include;$(SolutionDir)modules\c\nitf\include;$(SolutionDir)modules\c++\nitf\include;$(SolutionDir)modules\c\j2k\include;$(SolutionDir)modules\c;$(SolutionDir)modules\c++;$(SolutionDir)externals\coda-oss\modules\c++;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions);CODA_OSS_LIBRARY_SHARED=1 - true - pch.h - AdvancedVectorExtensions2 - MultiThreadedDebugDLL - true - true - true - true - true - Guard - ProgramDatabase - - - Windows - $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - Level3 - true - true - true - $(ProjectDir);$(SolutionDir)modules\c\nrt\include;$(SolutionDir)modules\c\nitf\include;$(SolutionDir)modules\c++\nitf\include;$(SolutionDir)modules\c\j2k\include;$(SolutionDir)modules\c;$(SolutionDir)modules\c++;$(SolutionDir)externals\coda-oss\modules\c++;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions);CODA_OSS_LIBRARY_SHARED=1 - true - pch.h - AdvancedVectorExtensions2 - Guard - true - true - true - true - - - Windows - true - true - $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - Create - Create - - - - - - - - - - - {9997e895-5161-4ddf-8f3f-099894cb2f21} - - - {8f357a19-799e-4971-850e-3f28485c130b} - - - {f06550ad-cfc7-40b8-8727-6c82c69a8982} - - - - - - \ No newline at end of file diff --git a/externals/nitro/UnitTest/UnitTest.vcxproj.filters b/externals/nitro/UnitTest/UnitTest.vcxproj.filters deleted file mode 100644 index 4b8da65dfc..0000000000 --- a/externals/nitro/UnitTest/UnitTest.vcxproj.filters +++ /dev/null @@ -1,135 +0,0 @@ - - - - - {d6b8959a-344d-4af2-b926-05be973609a4} - - - {a03980e8-d43d-473b-9f2a-a883ddd94df0} - - - {555282a7-bf5d-4012-842a-435bfb7324ab} - - - - - nrt - - - - nrt - - - - nrt - - - nrt - - - nrt - - - nrt - - - nrt - - - nrt - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - nitf-c++ - - - - - - - - - \ No newline at end of file diff --git a/externals/nitro/UnitTest/pch.h b/externals/nitro/UnitTest/pch.h deleted file mode 100644 index 86707841a5..0000000000 --- a/externals/nitro/UnitTest/pch.h +++ /dev/null @@ -1,41 +0,0 @@ -// pch.h: This is a precompiled header file. -// Files listed below are compiled only once, improving build performance for future builds. -// This also affects IntelliSense performance, including code completion and many code browsing features. -// However, files listed here are ALL re-compiled if any one of them is updated between builds. -// Do not add files here that you will be updating frequently as this negates the performance advantage. - -#ifndef PCH_H -#define PCH_H - -// add headers that you want to pre-compile here - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX -#pragma warning(push) -#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. -#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior -#include -#pragma warning(pop) -#pragma comment(lib, "ws2_32") - -// We're building in Visual Studio ... used to control where we get a little bit of config info -#define NITRO_PCH 1 -#ifndef CODA_OSS_LIBRARY_SHARED -#define CODA_OSS_LIBRARY_SHARED 1 -#endif - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include "Test.h" - -#endif //PCH_H diff --git a/externals/nitro/conanfile.py b/externals/nitro/conanfile.py deleted file mode 100644 index 334722a312..0000000000 --- a/externals/nitro/conanfile.py +++ /dev/null @@ -1,57 +0,0 @@ -"""Conan recipe for building Nitro""" - -from conans import ConanFile, CMake, tools -import os -import sys - -class NitroConan(ConanFile): - name = "nitro" - url = "https://github.com/mdaus/nitro" - description = "library for reading and writing the National Imagery Transmission Format (NITF)" - settings = "os", "compiler", "build_type", "arch" - requires = ("coda-oss/master_1ac97fe4897896fd", ) - options = {"shared": [True, False]} - default_options = {"shared": False} - exports_sources = ("CMakeLists.txt", - "LICENSE", - "README.md", - "cmake/*", - "modules/*", - ) - generators = "cmake_paths" - license = "GNU LESSER GENERAL PUBLIC LICENSE Version 3" - - # default to short_paths mode (Windows only) - short_paths = True - # default the short_paths home to ~/.conan_short - # this may be overridden by setting the environment variable - # CONAN_USER_HOME_SHORT or setting user_home_short in ~/.conan/conan.conf - if sys.platform.startswith('win32') and os.getenv("CONAN_USER_HOME_SHORT") is None: - os.environ["CONAN_USER_HOME_SHORT"] = os.path.join( - os.path.expanduser("~"), ".conan_short") - - def set_version(self): - git = tools.Git(folder=self.recipe_folder) - self.version = git.get_revision()[:16] - - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["ENABLE_STATIC_TRES"] = True # always build static TRES - cmake.definitions["ENABLE_J2K"] = self.options["coda-oss"].ENABLE_J2K - cmake.configure() - return cmake - - def build(self): - cmake = self._configure_cmake() - cmake.build() - - def package(self): - cmake = self._configure_cmake() - cmake.install() - - def package_id(self): - # Make any change in our dependencies' version require a new binary - self.info.requires.full_version_mode() - - def package_info(self): - self.cpp_info.builddirs = ["lib/cmake"] diff --git a/externals/nitro/copy_externals.csh b/externals/nitro/copy_externals.csh deleted file mode 100755 index 1674c143d1..0000000000 --- a/externals/nitro/copy_externals.csh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/csh -f - -rm -r -f tmp && mkdir tmp && cd tmp -git clone --depth 1 -b main git@github.com:mdaus/coda-oss.git -rm -r -f coda-oss/.git - -cd .. -rm -r -f externals/coda-oss -mv tmp/coda-oss externals -rm -r -f externals/coda-oss/.git -rmdir tmp diff --git a/externals/nitro/modules/c++/nitf/apps/show_nitf++/pch.cpp b/externals/nitro/modules/c++/nitf/apps/show_nitf++/pch.cpp deleted file mode 100644 index 64b7eef6d6..0000000000 --- a/externals/nitro/modules/c++/nitf/apps/show_nitf++/pch.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// pch.cpp: source file corresponding to the pre-compiled header - -#include "pch.h" - -// When you are using pre-compiled headers, this source file is necessary for compilation to succeed. diff --git a/externals/nitro/sync_externals.csh b/externals/nitro/sync_externals.csh deleted file mode 100755 index 15893f87a1..0000000000 --- a/externals/nitro/sync_externals.csh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/csh -f - -git remote add -f coda-oss_remote git@github.com:mdaus/coda-oss.git - -# To set this up the very first time -# This does a subtree merge and puts it in the externals/coda-oss directory. --squash avoids copying all the history -# You can replace 'master' with any branch of CODA-OSS you want -# git subtree add --prefix externals/coda-oss coda-oss_remote master --squash - -# Then, let's get rid of some externals we don't care about -# git is smart, so we only have to do this once and then future subtree pulls will never -# pull these in -# git rm -r externals/coda-oss/modules/drivers/fftw externals/coda-oss/modules/drivers/openssl externals/coda-oss/modules/drivers/pcre externals/coda-oss/modules/drivers/sql externals/coda-oss/modules/drivers/uuid externals/coda-oss/modules/drivers/zlib - -# Now we just want to update -# Here I'm assuming you're running this on the master branch... otherwise the push command should change -git subtree pull --prefix externals/coda-oss coda-oss_remote main --squash - -# If when you do this command you git a merge conflict because a file that has been removed here has been updated in CODA-OSS, you just need to do a 'git rm ' to resolve the merge conflict. Then a 'git commit'. -# TODO: Make this script smart enough to do this. -# git push origin main diff --git a/externals/nitro/test_package/CMakeLists.txt b/externals/nitro/test_package/CMakeLists.txt deleted file mode 100644 index 5a298bf8b5..0000000000 --- a/externals/nitro/test_package/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(nitro-test_package) -set(CMAKE_CXX_STANDARD 14) -set(CXX_STANDARD_REQUIRED true) -include(${CMAKE_BINARY_DIR}/conan_paths.cmake) -find_package(nitro) - -foreach (suffix "" "_RELEASE" "_DEBUG" "_RELWITHDEBINFO" "_MINSIZEREL") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY${suffix} ${CMAKE_CURRENT_BINARY_DIR}/bin) -endforeach() - -add_definitions(-DNOMINMAX) - -add_executable(test test.cpp) -target_link_libraries(test nitf-c++) diff --git a/externals/nitro/test_package/conanfile.py b/externals/nitro/test_package/conanfile.py deleted file mode 100644 index d804656f3f..0000000000 --- a/externals/nitro/test_package/conanfile.py +++ /dev/null @@ -1,14 +0,0 @@ -from conans import ConanFile, CMake -import os - -class NitroTestConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake_paths" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - self.run(os.path.join("bin", "test"), run_environment=True) diff --git a/externals/nitro/test_package/test.cpp b/externals/nitro/test_package/test.cpp deleted file mode 100644 index ada40978e2..0000000000 --- a/externals/nitro/test_package/test.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - nitf::Reader reader; - return 0; -} diff --git a/externals/nitro/waf b/externals/nitro/waf deleted file mode 100755 index cc1ce15071..0000000000 --- a/externals/nitro/waf +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -import os, sys, subprocess - -coda_oss = 'coda-oss' -path_to_waf = os.path.join(os.path.dirname(__file__), 'externals', coda_oss, 'build', 'waf') - -cmd = [sys.executable, path_to_waf] + sys.argv[1:] -try: - sys.exit(subprocess.call(cmd)) -except KeyboardInterrupt: - sys.exit(1) diff --git a/externals/nitro/wscript b/externals/nitro/wscript deleted file mode 100644 index 714ee7d719..0000000000 --- a/externals/nitro/wscript +++ /dev/null @@ -1,42 +0,0 @@ -import os -from build import CPPOptionsContext -from waflib import Scripting, Options -from waflib.Build import BuildContext -from waflib.Tools import waf_unit_test - -APPNAME = 'nitro' -top = '.' -out = 'target' - -TOOLS = 'build swig pythontool' -DIRS = 'externals modules' - -def options(opt): - opt.load(TOOLS + ' msvs dumpenv', tooldir='build') - opt.add_option('--release', action='store_true', dest='release', - help='Configure release', default=False) - opt.recurse(DIRS) - -def configure(conf): - conf.env['APPNAME'] = APPNAME - conf.load(TOOLS, tooldir='build') - - if conf.env['COMPILER_CXX'] != 'msvc': - conf.env.CFLAGS += ['-Wall']; - conf.env.CXXFLAGS += ['-Wall']; - - conf.recurse(DIRS) - -def build(bld): - bld.launch_dir = os.path.join(bld.launch_dir, 'modules') - bld.recurse(DIRS) - - dct = {'INSTALL':bld.env['PREFIX'], 'VERSION':bld.env['VERSION'], 'PLATFORM':bld.env['PLATFORM']} - bld(features='subst', dct=dct, source='utils/installer/nitro_installer.iss.in', - target=bld.path.find_or_declare('installer/nitro_installer.iss'), name='installer') - bld.install_files('target/installer', bld.path.ant_glob(['utils/installer/*.bmp','utils/installer/*.ico'])) - bld.add_post_fun(waf_unit_test.summary) - -def distclean(context): - context.recurse(DIRS) - Scripting.distclean(context) diff --git a/externals/wscript b/externals/wscript index 33b2bf0713..6b13711471 100644 --- a/externals/wscript +++ b/externals/wscript @@ -1,18 +1,18 @@ -import os +from os.path import join, exists +from waflib import Options, Utils +from build import CPPBuildContext coda_oss = 'coda-oss' -nitro = 'nitro' - -DIRS = [os.path.join(coda_oss, 'modules'), os.path.join(nitro, 'modules')] +MODULES = coda_oss + '/modules' def options(opt): - opt.recurse(DIRS) + opt.recurse(MODULES) def configure(conf): - conf.recurse(DIRS) + conf.recurse(MODULES) def build(bld): - bld.recurse(DIRS) + bld.recurse(MODULES) def distclean(context): - context.recurse(DIRS) + context.recurse(MODULES) diff --git a/externals/nitro/modules/CMakeLists.txt b/modules/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/CMakeLists.txt rename to modules/CMakeLists.txt diff --git a/externals/nitro/modules/c++/CMakeLists.txt b/modules/c++/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c++/CMakeLists.txt rename to modules/c++/CMakeLists.txt diff --git a/externals/nitro/modules/c++/Doxyfile b/modules/c++/Doxyfile similarity index 100% rename from externals/nitro/modules/c++/Doxyfile rename to modules/c++/Doxyfile diff --git a/externals/nitro/modules/c++/nitf-c++.vcxproj b/modules/c++/nitf-c++.vcxproj similarity index 100% rename from externals/nitro/modules/c++/nitf-c++.vcxproj rename to modules/c++/nitf-c++.vcxproj diff --git a/externals/nitro/modules/c++/nitf-c++.vcxproj.filters b/modules/c++/nitf-c++.vcxproj.filters similarity index 100% rename from externals/nitro/modules/c++/nitf-c++.vcxproj.filters rename to modules/c++/nitf-c++.vcxproj.filters diff --git a/externals/nitro/modules/c++/nitf.ruleset b/modules/c++/nitf.ruleset similarity index 100% rename from externals/nitro/modules/c++/nitf.ruleset rename to modules/c++/nitf.ruleset diff --git a/externals/nitro/modules/c++/nitf/CMakeLists.txt b/modules/c++/nitf/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c++/nitf/CMakeLists.txt rename to modules/c++/nitf/CMakeLists.txt diff --git a/externals/nitro/modules/c++/nitf/README.txt b/modules/c++/nitf/README.txt similarity index 100% rename from externals/nitro/modules/c++/nitf/README.txt rename to modules/c++/nitf/README.txt diff --git a/externals/nitro/modules/c++/nitf/apps/show_nitf++.cpp b/modules/c++/nitf/apps/show_nitf++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/apps/show_nitf++.cpp rename to modules/c++/nitf/apps/show_nitf++.cpp diff --git a/externals/nitro/UnitTest/pch.cpp b/modules/c++/nitf/apps/show_nitf++/pch.cpp similarity index 100% rename from externals/nitro/UnitTest/pch.cpp rename to modules/c++/nitf/apps/show_nitf++/pch.cpp diff --git a/externals/nitro/modules/c++/nitf/apps/show_nitf++/pch.h b/modules/c++/nitf/apps/show_nitf++/pch.h similarity index 100% rename from externals/nitro/modules/c++/nitf/apps/show_nitf++/pch.h rename to modules/c++/nitf/apps/show_nitf++/pch.h diff --git a/externals/nitro/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj b/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj similarity index 100% rename from externals/nitro/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj rename to modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj diff --git a/externals/nitro/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj.filters b/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj.filters similarity index 100% rename from externals/nitro/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj.filters rename to modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj.filters diff --git a/externals/nitro/modules/c++/nitf/include/import/nitf.hpp b/modules/c++/nitf/include/import/nitf.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/import/nitf.hpp rename to modules/c++/nitf/include/import/nitf.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/BandInfo.hpp b/modules/c++/nitf/include/nitf/BandInfo.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/BandInfo.hpp rename to modules/c++/nitf/include/nitf/BandInfo.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/BandSource.hpp b/modules/c++/nitf/include/nitf/BandSource.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/BandSource.hpp rename to modules/c++/nitf/include/nitf/BandSource.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/BlockingInfo.hpp b/modules/c++/nitf/include/nitf/BlockingInfo.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/BlockingInfo.hpp rename to modules/c++/nitf/include/nitf/BlockingInfo.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/BufferedReader.hpp b/modules/c++/nitf/include/nitf/BufferedReader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/BufferedReader.hpp rename to modules/c++/nitf/include/nitf/BufferedReader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/BufferedWriter.hpp b/modules/c++/nitf/include/nitf/BufferedWriter.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/BufferedWriter.hpp rename to modules/c++/nitf/include/nitf/BufferedWriter.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ByteProvider.hpp b/modules/c++/nitf/include/nitf/ByteProvider.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ByteProvider.hpp rename to modules/c++/nitf/include/nitf/ByteProvider.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ComponentInfo.hpp b/modules/c++/nitf/include/nitf/ComponentInfo.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ComponentInfo.hpp rename to modules/c++/nitf/include/nitf/ComponentInfo.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/CompressedByteProvider.hpp b/modules/c++/nitf/include/nitf/CompressedByteProvider.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/CompressedByteProvider.hpp rename to modules/c++/nitf/include/nitf/CompressedByteProvider.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/CompressionInterface.hpp b/modules/c++/nitf/include/nitf/CompressionInterface.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/CompressionInterface.hpp rename to modules/c++/nitf/include/nitf/CompressionInterface.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/CustomIO.hpp b/modules/c++/nitf/include/nitf/CustomIO.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/CustomIO.hpp rename to modules/c++/nitf/include/nitf/CustomIO.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DESegment.hpp b/modules/c++/nitf/include/nitf/DESegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DESegment.hpp rename to modules/c++/nitf/include/nitf/DESegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DESubheader.hpp b/modules/c++/nitf/include/nitf/DESubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DESubheader.hpp rename to modules/c++/nitf/include/nitf/DESubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DataSource.hpp b/modules/c++/nitf/include/nitf/DataSource.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DataSource.hpp rename to modules/c++/nitf/include/nitf/DataSource.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DateTime.hpp b/modules/c++/nitf/include/nitf/DateTime.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DateTime.hpp rename to modules/c++/nitf/include/nitf/DateTime.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DecompressionInterface.hpp b/modules/c++/nitf/include/nitf/DecompressionInterface.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DecompressionInterface.hpp rename to modules/c++/nitf/include/nitf/DecompressionInterface.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/DownSampler.hpp b/modules/c++/nitf/include/nitf/DownSampler.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/DownSampler.hpp rename to modules/c++/nitf/include/nitf/DownSampler.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Enum.hpp b/modules/c++/nitf/include/nitf/Enum.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Enum.hpp rename to modules/c++/nitf/include/nitf/Enum.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Extensions.hpp b/modules/c++/nitf/include/nitf/Extensions.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Extensions.hpp rename to modules/c++/nitf/include/nitf/Extensions.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp b/modules/c++/nitf/include/nitf/Field.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Field.hpp rename to modules/c++/nitf/include/nitf/Field.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/FieldDescriptor.hpp b/modules/c++/nitf/include/nitf/FieldDescriptor.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/FieldDescriptor.hpp rename to modules/c++/nitf/include/nitf/FieldDescriptor.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/FieldWarning.hpp b/modules/c++/nitf/include/nitf/FieldWarning.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/FieldWarning.hpp rename to modules/c++/nitf/include/nitf/FieldWarning.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/FileHeader.hpp b/modules/c++/nitf/include/nitf/FileHeader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/FileHeader.hpp rename to modules/c++/nitf/include/nitf/FileHeader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/FileSecurity.hpp b/modules/c++/nitf/include/nitf/FileSecurity.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/FileSecurity.hpp rename to modules/c++/nitf/include/nitf/FileSecurity.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/GraphicSegment.hpp b/modules/c++/nitf/include/nitf/GraphicSegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/GraphicSegment.hpp rename to modules/c++/nitf/include/nitf/GraphicSegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/GraphicSubheader.hpp b/modules/c++/nitf/include/nitf/GraphicSubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/GraphicSubheader.hpp rename to modules/c++/nitf/include/nitf/GraphicSubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Handle.hpp b/modules/c++/nitf/include/nitf/Handle.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Handle.hpp rename to modules/c++/nitf/include/nitf/Handle.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/HandleManager.hpp b/modules/c++/nitf/include/nitf/HandleManager.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/HandleManager.hpp rename to modules/c++/nitf/include/nitf/HandleManager.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp b/modules/c++/nitf/include/nitf/HashTable.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/HashTable.hpp rename to modules/c++/nitf/include/nitf/HashTable.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/IOHandle.hpp b/modules/c++/nitf/include/nitf/IOHandle.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/IOHandle.hpp rename to modules/c++/nitf/include/nitf/IOHandle.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/IOInterface.hpp b/modules/c++/nitf/include/nitf/IOInterface.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/IOInterface.hpp rename to modules/c++/nitf/include/nitf/IOInterface.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp b/modules/c++/nitf/include/nitf/IOStreamReader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/IOStreamReader.hpp rename to modules/c++/nitf/include/nitf/IOStreamReader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/IOStreamWriter.hpp b/modules/c++/nitf/include/nitf/IOStreamWriter.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/IOStreamWriter.hpp rename to modules/c++/nitf/include/nitf/IOStreamWriter.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp b/modules/c++/nitf/include/nitf/ImageBlocker.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageBlocker.hpp rename to modules/c++/nitf/include/nitf/ImageBlocker.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp b/modules/c++/nitf/include/nitf/ImageReader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageReader.hpp rename to modules/c++/nitf/include/nitf/ImageReader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSegment.hpp b/modules/c++/nitf/include/nitf/ImageSegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageSegment.hpp rename to modules/c++/nitf/include/nitf/ImageSegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h b/modules/c++/nitf/include/nitf/ImageSegmentComputer.h similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageSegmentComputer.h rename to modules/c++/nitf/include/nitf/ImageSegmentComputer.h diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSource.hpp b/modules/c++/nitf/include/nitf/ImageSource.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageSource.hpp rename to modules/c++/nitf/include/nitf/ImageSource.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageSubheader.hpp b/modules/c++/nitf/include/nitf/ImageSubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageSubheader.hpp rename to modules/c++/nitf/include/nitf/ImageSubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/ImageWriter.hpp b/modules/c++/nitf/include/nitf/ImageWriter.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/ImageWriter.hpp rename to modules/c++/nitf/include/nitf/ImageWriter.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KComponent.hpp b/modules/c++/nitf/include/nitf/J2KComponent.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KComponent.hpp rename to modules/c++/nitf/include/nitf/J2KComponent.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KCompressionParameters.hpp b/modules/c++/nitf/include/nitf/J2KCompressionParameters.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KCompressionParameters.hpp rename to modules/c++/nitf/include/nitf/J2KCompressionParameters.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KCompressor.hpp b/modules/c++/nitf/include/nitf/J2KCompressor.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KCompressor.hpp rename to modules/c++/nitf/include/nitf/J2KCompressor.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KContainer.hpp b/modules/c++/nitf/include/nitf/J2KContainer.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KContainer.hpp rename to modules/c++/nitf/include/nitf/J2KContainer.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KEncoder.hpp b/modules/c++/nitf/include/nitf/J2KEncoder.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KEncoder.hpp rename to modules/c++/nitf/include/nitf/J2KEncoder.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KImage.hpp b/modules/c++/nitf/include/nitf/J2KImage.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KImage.hpp rename to modules/c++/nitf/include/nitf/J2KImage.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KReader.hpp b/modules/c++/nitf/include/nitf/J2KReader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KReader.hpp rename to modules/c++/nitf/include/nitf/J2KReader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KStream.hpp b/modules/c++/nitf/include/nitf/J2KStream.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KStream.hpp rename to modules/c++/nitf/include/nitf/J2KStream.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/J2KWriter.hpp b/modules/c++/nitf/include/nitf/J2KWriter.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/J2KWriter.hpp rename to modules/c++/nitf/include/nitf/J2KWriter.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/LabelSegment.hpp b/modules/c++/nitf/include/nitf/LabelSegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/LabelSegment.hpp rename to modules/c++/nitf/include/nitf/LabelSegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/LabelSubheader.hpp b/modules/c++/nitf/include/nitf/LabelSubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/LabelSubheader.hpp rename to modules/c++/nitf/include/nitf/LabelSubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/List.hpp b/modules/c++/nitf/include/nitf/List.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/List.hpp rename to modules/c++/nitf/include/nitf/List.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/LookupTable.hpp b/modules/c++/nitf/include/nitf/LookupTable.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/LookupTable.hpp rename to modules/c++/nitf/include/nitf/LookupTable.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/MemoryIO.hpp b/modules/c++/nitf/include/nitf/MemoryIO.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/MemoryIO.hpp rename to modules/c++/nitf/include/nitf/MemoryIO.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/NITFBufferList.hpp b/modules/c++/nitf/include/nitf/NITFBufferList.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/NITFBufferList.hpp rename to modules/c++/nitf/include/nitf/NITFBufferList.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp b/modules/c++/nitf/include/nitf/NITFException.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp rename to modules/c++/nitf/include/nitf/NITFException.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Object.hpp b/modules/c++/nitf/include/nitf/Object.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Object.hpp rename to modules/c++/nitf/include/nitf/Object.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Pair.hpp b/modules/c++/nitf/include/nitf/Pair.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Pair.hpp rename to modules/c++/nitf/include/nitf/Pair.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/PluginRegistry.hpp b/modules/c++/nitf/include/nitf/PluginRegistry.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/PluginRegistry.hpp rename to modules/c++/nitf/include/nitf/PluginRegistry.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Property.hpp b/modules/c++/nitf/include/nitf/Property.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Property.hpp rename to modules/c++/nitf/include/nitf/Property.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/RESegment.hpp b/modules/c++/nitf/include/nitf/RESegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/RESegment.hpp rename to modules/c++/nitf/include/nitf/RESegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/RESubheader.hpp b/modules/c++/nitf/include/nitf/RESubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/RESubheader.hpp rename to modules/c++/nitf/include/nitf/RESubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Reader.hpp b/modules/c++/nitf/include/nitf/Reader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Reader.hpp rename to modules/c++/nitf/include/nitf/Reader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Record.hpp b/modules/c++/nitf/include/nitf/Record.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Record.hpp rename to modules/c++/nitf/include/nitf/Record.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/SegmentReader.hpp b/modules/c++/nitf/include/nitf/SegmentReader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/SegmentReader.hpp rename to modules/c++/nitf/include/nitf/SegmentReader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/SegmentSource.hpp b/modules/c++/nitf/include/nitf/SegmentSource.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/SegmentSource.hpp rename to modules/c++/nitf/include/nitf/SegmentSource.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/SegmentWriter.hpp b/modules/c++/nitf/include/nitf/SegmentWriter.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/SegmentWriter.hpp rename to modules/c++/nitf/include/nitf/SegmentWriter.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/SubWindow.hpp b/modules/c++/nitf/include/nitf/SubWindow.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/SubWindow.hpp rename to modules/c++/nitf/include/nitf/SubWindow.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/System.hpp b/modules/c++/nitf/include/nitf/System.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/System.hpp rename to modules/c++/nitf/include/nitf/System.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp b/modules/c++/nitf/include/nitf/TRE.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp rename to modules/c++/nitf/include/nitf/TRE.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TREField.hpp b/modules/c++/nitf/include/nitf/TREField.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TREField.hpp rename to modules/c++/nitf/include/nitf/TREField.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TREsTyped.hpp b/modules/c++/nitf/include/nitf/TREsTyped.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TREsTyped.hpp rename to modules/c++/nitf/include/nitf/TREsTyped.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TestingTest.hpp b/modules/c++/nitf/include/nitf/TestingTest.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TestingTest.hpp rename to modules/c++/nitf/include/nitf/TestingTest.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TextSegment.hpp b/modules/c++/nitf/include/nitf/TextSegment.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TextSegment.hpp rename to modules/c++/nitf/include/nitf/TextSegment.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TextSubheader.hpp b/modules/c++/nitf/include/nitf/TextSubheader.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/TextSubheader.hpp rename to modules/c++/nitf/include/nitf/TextSubheader.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/UnitTests.hpp b/modules/c++/nitf/include/nitf/UnitTests.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/UnitTests.hpp rename to modules/c++/nitf/include/nitf/UnitTests.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Utils.hpp b/modules/c++/nitf/include/nitf/Utils.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Utils.hpp rename to modules/c++/nitf/include/nitf/Utils.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp b/modules/c++/nitf/include/nitf/Version.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Version.hpp rename to modules/c++/nitf/include/nitf/Version.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/WriteHandler.hpp b/modules/c++/nitf/include/nitf/WriteHandler.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/WriteHandler.hpp rename to modules/c++/nitf/include/nitf/WriteHandler.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Writer.hpp b/modules/c++/nitf/include/nitf/Writer.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/Writer.hpp rename to modules/c++/nitf/include/nitf/Writer.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/WriterOptions.hpp b/modules/c++/nitf/include/nitf/WriterOptions.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/WriterOptions.hpp rename to modules/c++/nitf/include/nitf/WriterOptions.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/coda-oss.hpp b/modules/c++/nitf/include/nitf/coda-oss.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/coda-oss.hpp rename to modules/c++/nitf/include/nitf/coda-oss.hpp diff --git a/externals/nitro/modules/c++/nitf/include/nitf/exports.hpp b/modules/c++/nitf/include/nitf/exports.hpp similarity index 100% rename from externals/nitro/modules/c++/nitf/include/nitf/exports.hpp rename to modules/c++/nitf/include/nitf/exports.hpp diff --git a/externals/nitro/modules/c++/nitf/source/BandInfo.cpp b/modules/c++/nitf/source/BandInfo.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/BandInfo.cpp rename to modules/c++/nitf/source/BandInfo.cpp diff --git a/externals/nitro/modules/c++/nitf/source/BandSource.cpp b/modules/c++/nitf/source/BandSource.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/BandSource.cpp rename to modules/c++/nitf/source/BandSource.cpp diff --git a/externals/nitro/modules/c++/nitf/source/BlockingInfo.cpp b/modules/c++/nitf/source/BlockingInfo.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/BlockingInfo.cpp rename to modules/c++/nitf/source/BlockingInfo.cpp diff --git a/externals/nitro/modules/c++/nitf/source/BufferedReader.cpp b/modules/c++/nitf/source/BufferedReader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/BufferedReader.cpp rename to modules/c++/nitf/source/BufferedReader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/BufferedWriter.cpp b/modules/c++/nitf/source/BufferedWriter.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/BufferedWriter.cpp rename to modules/c++/nitf/source/BufferedWriter.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ByteProvider.cpp b/modules/c++/nitf/source/ByteProvider.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ByteProvider.cpp rename to modules/c++/nitf/source/ByteProvider.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ComponentInfo.cpp b/modules/c++/nitf/source/ComponentInfo.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ComponentInfo.cpp rename to modules/c++/nitf/source/ComponentInfo.cpp diff --git a/externals/nitro/modules/c++/nitf/source/CompressedByteProvider.cpp b/modules/c++/nitf/source/CompressedByteProvider.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/CompressedByteProvider.cpp rename to modules/c++/nitf/source/CompressedByteProvider.cpp diff --git a/externals/nitro/modules/c++/nitf/source/CompressionInterface.cpp b/modules/c++/nitf/source/CompressionInterface.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/CompressionInterface.cpp rename to modules/c++/nitf/source/CompressionInterface.cpp diff --git a/externals/nitro/modules/c++/nitf/source/CustomIO.cpp b/modules/c++/nitf/source/CustomIO.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/CustomIO.cpp rename to modules/c++/nitf/source/CustomIO.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DESegment.cpp b/modules/c++/nitf/source/DESegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DESegment.cpp rename to modules/c++/nitf/source/DESegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DESubheader.cpp b/modules/c++/nitf/source/DESubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DESubheader.cpp rename to modules/c++/nitf/source/DESubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DataSource.cpp b/modules/c++/nitf/source/DataSource.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DataSource.cpp rename to modules/c++/nitf/source/DataSource.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DateTime.cpp b/modules/c++/nitf/source/DateTime.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DateTime.cpp rename to modules/c++/nitf/source/DateTime.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DecompressionInterface.cpp b/modules/c++/nitf/source/DecompressionInterface.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DecompressionInterface.cpp rename to modules/c++/nitf/source/DecompressionInterface.cpp diff --git a/externals/nitro/modules/c++/nitf/source/DownSampler.cpp b/modules/c++/nitf/source/DownSampler.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/DownSampler.cpp rename to modules/c++/nitf/source/DownSampler.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Extensions.cpp b/modules/c++/nitf/source/Extensions.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Extensions.cpp rename to modules/c++/nitf/source/Extensions.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Field.cpp b/modules/c++/nitf/source/Field.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Field.cpp rename to modules/c++/nitf/source/Field.cpp diff --git a/externals/nitro/modules/c++/nitf/source/FieldDescriptor.cpp b/modules/c++/nitf/source/FieldDescriptor.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/FieldDescriptor.cpp rename to modules/c++/nitf/source/FieldDescriptor.cpp diff --git a/externals/nitro/modules/c++/nitf/source/FieldWarning.cpp b/modules/c++/nitf/source/FieldWarning.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/FieldWarning.cpp rename to modules/c++/nitf/source/FieldWarning.cpp diff --git a/externals/nitro/modules/c++/nitf/source/FileHeader.cpp b/modules/c++/nitf/source/FileHeader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/FileHeader.cpp rename to modules/c++/nitf/source/FileHeader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/FileSecurity.cpp b/modules/c++/nitf/source/FileSecurity.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/FileSecurity.cpp rename to modules/c++/nitf/source/FileSecurity.cpp diff --git a/externals/nitro/modules/c++/nitf/source/GraphicSegment.cpp b/modules/c++/nitf/source/GraphicSegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/GraphicSegment.cpp rename to modules/c++/nitf/source/GraphicSegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/GraphicSubheader.cpp b/modules/c++/nitf/source/GraphicSubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/GraphicSubheader.cpp rename to modules/c++/nitf/source/GraphicSubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Handle.cpp b/modules/c++/nitf/source/Handle.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Handle.cpp rename to modules/c++/nitf/source/Handle.cpp diff --git a/externals/nitro/modules/c++/nitf/source/HashTable.cpp b/modules/c++/nitf/source/HashTable.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/HashTable.cpp rename to modules/c++/nitf/source/HashTable.cpp diff --git a/externals/nitro/modules/c++/nitf/source/IOHandle.cpp b/modules/c++/nitf/source/IOHandle.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/IOHandle.cpp rename to modules/c++/nitf/source/IOHandle.cpp diff --git a/externals/nitro/modules/c++/nitf/source/IOInterface.cpp b/modules/c++/nitf/source/IOInterface.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/IOInterface.cpp rename to modules/c++/nitf/source/IOInterface.cpp diff --git a/externals/nitro/modules/c++/nitf/source/IOStreamReader.cpp b/modules/c++/nitf/source/IOStreamReader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/IOStreamReader.cpp rename to modules/c++/nitf/source/IOStreamReader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/IOStreamWriter.cpp b/modules/c++/nitf/source/IOStreamWriter.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/IOStreamWriter.cpp rename to modules/c++/nitf/source/IOStreamWriter.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageBlocker.cpp b/modules/c++/nitf/source/ImageBlocker.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageBlocker.cpp rename to modules/c++/nitf/source/ImageBlocker.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageReader.cpp b/modules/c++/nitf/source/ImageReader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageReader.cpp rename to modules/c++/nitf/source/ImageReader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageSegment.cpp b/modules/c++/nitf/source/ImageSegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageSegment.cpp rename to modules/c++/nitf/source/ImageSegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageSegmentComputer.cpp b/modules/c++/nitf/source/ImageSegmentComputer.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageSegmentComputer.cpp rename to modules/c++/nitf/source/ImageSegmentComputer.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageSource.cpp b/modules/c++/nitf/source/ImageSource.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageSource.cpp rename to modules/c++/nitf/source/ImageSource.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageSubheader.cpp b/modules/c++/nitf/source/ImageSubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageSubheader.cpp rename to modules/c++/nitf/source/ImageSubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/ImageWriter.cpp b/modules/c++/nitf/source/ImageWriter.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/ImageWriter.cpp rename to modules/c++/nitf/source/ImageWriter.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KComponent.cpp b/modules/c++/nitf/source/J2KComponent.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KComponent.cpp rename to modules/c++/nitf/source/J2KComponent.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KCompressionParameters.cpp b/modules/c++/nitf/source/J2KCompressionParameters.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KCompressionParameters.cpp rename to modules/c++/nitf/source/J2KCompressionParameters.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KCompressor.cpp b/modules/c++/nitf/source/J2KCompressor.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KCompressor.cpp rename to modules/c++/nitf/source/J2KCompressor.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KContainer.cpp b/modules/c++/nitf/source/J2KContainer.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KContainer.cpp rename to modules/c++/nitf/source/J2KContainer.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KEncoder.cpp b/modules/c++/nitf/source/J2KEncoder.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KEncoder.cpp rename to modules/c++/nitf/source/J2KEncoder.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KImage.cpp b/modules/c++/nitf/source/J2KImage.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KImage.cpp rename to modules/c++/nitf/source/J2KImage.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KReader.cpp b/modules/c++/nitf/source/J2KReader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KReader.cpp rename to modules/c++/nitf/source/J2KReader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KStream.cpp b/modules/c++/nitf/source/J2KStream.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KStream.cpp rename to modules/c++/nitf/source/J2KStream.cpp diff --git a/externals/nitro/modules/c++/nitf/source/J2KWriter.cpp b/modules/c++/nitf/source/J2KWriter.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/J2KWriter.cpp rename to modules/c++/nitf/source/J2KWriter.cpp diff --git a/externals/nitro/modules/c++/nitf/source/LabelSegment.cpp b/modules/c++/nitf/source/LabelSegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/LabelSegment.cpp rename to modules/c++/nitf/source/LabelSegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/LabelSubheader.cpp b/modules/c++/nitf/source/LabelSubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/LabelSubheader.cpp rename to modules/c++/nitf/source/LabelSubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/List.cpp b/modules/c++/nitf/source/List.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/List.cpp rename to modules/c++/nitf/source/List.cpp diff --git a/externals/nitro/modules/c++/nitf/source/LookupTable.cpp b/modules/c++/nitf/source/LookupTable.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/LookupTable.cpp rename to modules/c++/nitf/source/LookupTable.cpp diff --git a/externals/nitro/modules/c++/nitf/source/MemoryIO.cpp b/modules/c++/nitf/source/MemoryIO.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/MemoryIO.cpp rename to modules/c++/nitf/source/MemoryIO.cpp diff --git a/externals/nitro/modules/c++/nitf/source/NITFBufferList.cpp b/modules/c++/nitf/source/NITFBufferList.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/NITFBufferList.cpp rename to modules/c++/nitf/source/NITFBufferList.cpp diff --git a/externals/nitro/modules/c++/nitf/source/PluginRegistry.cpp b/modules/c++/nitf/source/PluginRegistry.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/PluginRegistry.cpp rename to modules/c++/nitf/source/PluginRegistry.cpp diff --git a/externals/nitro/modules/c++/nitf/source/RESegment.cpp b/modules/c++/nitf/source/RESegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/RESegment.cpp rename to modules/c++/nitf/source/RESegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/RESubheader.cpp b/modules/c++/nitf/source/RESubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/RESubheader.cpp rename to modules/c++/nitf/source/RESubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Reader.cpp b/modules/c++/nitf/source/Reader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Reader.cpp rename to modules/c++/nitf/source/Reader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Record.cpp b/modules/c++/nitf/source/Record.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Record.cpp rename to modules/c++/nitf/source/Record.cpp diff --git a/externals/nitro/modules/c++/nitf/source/SegmentReader.cpp b/modules/c++/nitf/source/SegmentReader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/SegmentReader.cpp rename to modules/c++/nitf/source/SegmentReader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/SegmentSource.cpp b/modules/c++/nitf/source/SegmentSource.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/SegmentSource.cpp rename to modules/c++/nitf/source/SegmentSource.cpp diff --git a/externals/nitro/modules/c++/nitf/source/SegmentWriter.cpp b/modules/c++/nitf/source/SegmentWriter.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/SegmentWriter.cpp rename to modules/c++/nitf/source/SegmentWriter.cpp diff --git a/externals/nitro/modules/c++/nitf/source/SubWindow.cpp b/modules/c++/nitf/source/SubWindow.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/SubWindow.cpp rename to modules/c++/nitf/source/SubWindow.cpp diff --git a/externals/nitro/modules/c++/nitf/source/TRE.cpp b/modules/c++/nitf/source/TRE.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/TRE.cpp rename to modules/c++/nitf/source/TRE.cpp diff --git a/externals/nitro/modules/c++/nitf/source/TestingTest.cpp b/modules/c++/nitf/source/TestingTest.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/TestingTest.cpp rename to modules/c++/nitf/source/TestingTest.cpp diff --git a/externals/nitro/modules/c++/nitf/source/TextSegment.cpp b/modules/c++/nitf/source/TextSegment.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/TextSegment.cpp rename to modules/c++/nitf/source/TextSegment.cpp diff --git a/externals/nitro/modules/c++/nitf/source/TextSubheader.cpp b/modules/c++/nitf/source/TextSubheader.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/TextSubheader.cpp rename to modules/c++/nitf/source/TextSubheader.cpp diff --git a/externals/nitro/modules/c++/nitf/source/UnitTests.cpp b/modules/c++/nitf/source/UnitTests.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/UnitTests.cpp rename to modules/c++/nitf/source/UnitTests.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Utils.cpp b/modules/c++/nitf/source/Utils.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Utils.cpp rename to modules/c++/nitf/source/Utils.cpp diff --git a/externals/nitro/modules/c++/nitf/source/WriteHandler.cpp b/modules/c++/nitf/source/WriteHandler.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/WriteHandler.cpp rename to modules/c++/nitf/source/WriteHandler.cpp diff --git a/externals/nitro/modules/c++/nitf/source/Writer.cpp b/modules/c++/nitf/source/Writer.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/source/Writer.cpp rename to modules/c++/nitf/source/Writer.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/strip_invisible_segments.cpp b/modules/c++/nitf/tests/strip_invisible_segments.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/strip_invisible_segments.cpp rename to modules/c++/nitf/tests/strip_invisible_segments.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_blank.ntf b/modules/c++/nitf/tests/test_blank.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_blank.ntf rename to modules/c++/nitf/tests/test_blank.ntf diff --git a/externals/nitro/modules/c++/nitf/tests/test_buffered_read.cpp b/modules/c++/nitf/tests/test_buffered_read.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_buffered_read.cpp rename to modules/c++/nitf/tests/test_buffered_read.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_create++.cpp b/modules/c++/nitf/tests/test_create++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_create++.cpp rename to modules/c++/nitf/tests/test_create++.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_date.cpp b/modules/c++/nitf/tests/test_date.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_date.cpp rename to modules/c++/nitf/tests/test_date.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_date_set.cpp b/modules/c++/nitf/tests/test_date_set.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_date_set.cpp rename to modules/c++/nitf/tests/test_date_set.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_des_create++.cpp b/modules/c++/nitf/tests/test_des_create++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_des_create++.cpp rename to modules/c++/nitf/tests/test_des_create++.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_direct_block_round_trip.cpp b/modules/c++/nitf/tests/test_direct_block_round_trip.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_direct_block_round_trip.cpp rename to modules/c++/nitf/tests/test_direct_block_round_trip.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_extract.cpp b/modules/c++/nitf/tests/test_extract.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_extract.cpp rename to modules/c++/nitf/tests/test_extract.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_fh.cpp b/modules/c++/nitf/tests/test_fh.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_fh.cpp rename to modules/c++/nitf/tests/test_fh.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_fhdr_clone++.cpp b/modules/c++/nitf/tests/test_fhdr_clone++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_fhdr_clone++.cpp rename to modules/c++/nitf/tests/test_fhdr_clone++.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_file_source++.cpp b/modules/c++/nitf/tests/test_file_source++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_file_source++.cpp rename to modules/c++/nitf/tests/test_file_source++.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_functional.cpp b/modules/c++/nitf/tests/test_functional.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_functional.cpp rename to modules/c++/nitf/tests/test_functional.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_functional.h b/modules/c++/nitf/tests/test_functional.h similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_functional.h rename to modules/c++/nitf/tests/test_functional.h diff --git a/externals/nitro/modules/c++/nitf/tests/test_handles.cpp b/modules/c++/nitf/tests/test_handles.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_handles.cpp rename to modules/c++/nitf/tests/test_handles.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_io.cpp b/modules/c++/nitf/tests/test_io.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_io.cpp rename to modules/c++/nitf/tests/test_io.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.cpp b/modules/c++/nitf/tests/test_j2k_nitf_read_region.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.cpp rename to modules/c++/nitf/tests/test_j2k_nitf_read_region.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj b/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj rename to modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj diff --git a/externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj.filters b/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj.filters similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj.filters rename to modules/c++/nitf/tests/test_j2k_nitf_read_region.vcxproj.filters diff --git a/externals/nitro/modules/c++/nitf/tests/test_list_1.cpp b/modules/c++/nitf/tests/test_list_1.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_list_1.cpp rename to modules/c++/nitf/tests/test_list_1.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_list_2.cpp b/modules/c++/nitf/tests/test_list_2.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_list_2.cpp rename to modules/c++/nitf/tests/test_list_2.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_mem_source.cpp b/modules/c++/nitf/tests/test_mem_source.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_mem_source.cpp rename to modules/c++/nitf/tests/test_mem_source.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_read_acftb.cpp b/modules/c++/nitf/tests/test_read_acftb.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_read_acftb.cpp rename to modules/c++/nitf/tests/test_read_acftb.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_ref_counts.cpp b/modules/c++/nitf/tests/test_ref_counts.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_ref_counts.cpp rename to modules/c++/nitf/tests/test_ref_counts.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp b/modules/c++/nitf/tests/test_round_trip.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_round_trip.cpp rename to modules/c++/nitf/tests/test_round_trip.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_static_plugin.cpp b/modules/c++/nitf/tests/test_static_plugin.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_static_plugin.cpp rename to modules/c++/nitf/tests/test_static_plugin.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_tre_create.cpp b/modules/c++/nitf/tests/test_tre_create.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_tre_create.cpp rename to modules/c++/nitf/tests/test_tre_create.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_writer_4.cpp b/modules/c++/nitf/tests/test_writer_4.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_writer_4.cpp rename to modules/c++/nitf/tests/test_writer_4.cpp diff --git a/externals/nitro/modules/c++/nitf/tests/test_writer_5.cpp b/modules/c++/nitf/tests/test_writer_5.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/tests/test_writer_5.cpp rename to modules/c++/nitf/tests/test_writer_5.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/No_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_no_amplitude_table_SICD.nitf b/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/No_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_no_amplitude_table_SICD.nitf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/No_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_no_amplitude_table_SICD.nitf rename to modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/No_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_no_amplitude_table_SICD.nitf diff --git a/externals/nitro/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/With_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_with_amplitude_table_SICD.nitf b/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/With_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_with_amplitude_table_SICD.nitf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/With_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_with_amplitude_table_SICD.nitf rename to modules/c++/nitf/unittests/8_bit_Amp_Phs_Examples/With_amplitude_table/sicd_example_1_PFA_AMP8I_PHS8I_VV_with_amplitude_table_SICD.nitf diff --git a/externals/nitro/modules/c++/nitf/unittests/TEST_CSEXRB.nitf b/modules/c++/nitf/unittests/TEST_CSEXRB.nitf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/TEST_CSEXRB.nitf rename to modules/c++/nitf/unittests/TEST_CSEXRB.nitf diff --git a/externals/nitro/modules/c++/nitf/unittests/bug2_crash.ntf b/modules/c++/nitf/unittests/bug2_crash.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/bug2_crash.ntf rename to modules/c++/nitf/unittests/bug2_crash.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/bug3_crash.ntf b/modules/c++/nitf/unittests/bug3_crash.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/bug3_crash.ntf rename to modules/c++/nitf/unittests/bug3_crash.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/bug4_crash.ntf b/modules/c++/nitf/unittests/bug4_crash.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/bug4_crash.ntf rename to modules/c++/nitf/unittests/bug4_crash.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/bug5_crash.ntf b/modules/c++/nitf/unittests/bug5_crash.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/bug5_crash.ntf rename to modules/c++/nitf/unittests/bug5_crash.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/bug6_hangs.ntf b/modules/c++/nitf/unittests/bug6_hangs.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/bug6_hangs.ntf rename to modules/c++/nitf/unittests/bug6_hangs.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/j2k_compressed_file1_jp2.ntf b/modules/c++/nitf/unittests/j2k_compressed_file1_jp2.ntf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/j2k_compressed_file1_jp2.ntf rename to modules/c++/nitf/unittests/j2k_compressed_file1_jp2.ntf diff --git a/externals/nitro/modules/c++/nitf/unittests/red_5x5.jpg b/modules/c++/nitf/unittests/red_5x5.jpg similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/red_5x5.jpg rename to modules/c++/nitf/unittests/red_5x5.jpg diff --git a/externals/nitro/modules/c++/nitf/unittests/sicd_50x50.nitf b/modules/c++/nitf/unittests/sicd_50x50.nitf similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/sicd_50x50.nitf rename to modules/c++/nitf/unittests/sicd_50x50.nitf diff --git a/externals/nitro/modules/c++/nitf/unittests/test_create_nitf++.cpp b/modules/c++/nitf/unittests/test_create_nitf++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_create_nitf++.cpp rename to modules/c++/nitf/unittests/test_create_nitf++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_field++.cpp b/modules/c++/nitf/unittests/test_field++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_field++.cpp rename to modules/c++/nitf/unittests/test_field++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_hash_table_1++.cpp b/modules/c++/nitf/unittests/test_hash_table_1++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_hash_table_1++.cpp rename to modules/c++/nitf/unittests/test_hash_table_1++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_image_blocker.cpp b/modules/c++/nitf/unittests/test_image_blocker.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_image_blocker.cpp rename to modules/c++/nitf/unittests/test_image_blocker.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_image_loading++.cpp b/modules/c++/nitf/unittests/test_image_loading++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_image_loading++.cpp rename to modules/c++/nitf/unittests/test_image_loading++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_image_segment_blank_nm_compression.cpp b/modules/c++/nitf/unittests/test_image_segment_blank_nm_compression.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_image_segment_blank_nm_compression.cpp rename to modules/c++/nitf/unittests/test_image_segment_blank_nm_compression.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_image_segment_computer.cpp b/modules/c++/nitf/unittests/test_image_segment_computer.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_image_segment_computer.cpp rename to modules/c++/nitf/unittests/test_image_segment_computer.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_image_writer.cpp b/modules/c++/nitf/unittests/test_image_writer.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_image_writer.cpp rename to modules/c++/nitf/unittests/test_image_writer.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_j2k_compress_tile.cpp b/modules/c++/nitf/unittests/test_j2k_compress_tile.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_j2k_compress_tile.cpp rename to modules/c++/nitf/unittests/test_j2k_compress_tile.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_j2k_compressed_byte_provider.cpp b/modules/c++/nitf/unittests/test_j2k_compressed_byte_provider.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_j2k_compressed_byte_provider.cpp rename to modules/c++/nitf/unittests/test_j2k_compressed_byte_provider.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_j2k_loading++.cpp b/modules/c++/nitf/unittests/test_j2k_loading++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_j2k_loading++.cpp rename to modules/c++/nitf/unittests/test_j2k_loading++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_j2k_read_tile.cpp b/modules/c++/nitf/unittests/test_j2k_read_tile.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_j2k_read_tile.cpp rename to modules/c++/nitf/unittests/test_j2k_read_tile.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp b/modules/c++/nitf/unittests/test_load_plugins.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp rename to modules/c++/nitf/unittests/test_load_plugins.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_nitf_buffer_list.cpp b/modules/c++/nitf/unittests/test_nitf_buffer_list.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_nitf_buffer_list.cpp rename to modules/c++/nitf/unittests/test_nitf_buffer_list.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_tre_create++.cpp b/modules/c++/nitf/unittests/test_tre_create++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_tre_create++.cpp rename to modules/c++/nitf/unittests/test_tre_create++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp b/modules/c++/nitf/unittests/test_tre_mods++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp rename to modules/c++/nitf/unittests/test_tre_mods++.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_tre_mods.cpp b/modules/c++/nitf/unittests/test_tre_mods.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_tre_mods.cpp rename to modules/c++/nitf/unittests/test_tre_mods.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_tre_read.cpp b/modules/c++/nitf/unittests/test_tre_read.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_tre_read.cpp rename to modules/c++/nitf/unittests/test_tre_read.cpp diff --git a/externals/nitro/modules/c++/nitf/unittests/test_writer_3++.cpp b/modules/c++/nitf/unittests/test_writer_3++.cpp similarity index 100% rename from externals/nitro/modules/c++/nitf/unittests/test_writer_3++.cpp rename to modules/c++/nitf/unittests/test_writer_3++.cpp diff --git a/externals/nitro/modules/c++/nitf/wscript b/modules/c++/nitf/wscript similarity index 100% rename from externals/nitro/modules/c++/nitf/wscript rename to modules/c++/nitf/wscript diff --git a/externals/nitro/modules/c++/pch.cpp b/modules/c++/pch.cpp similarity index 100% rename from externals/nitro/modules/c++/pch.cpp rename to modules/c++/pch.cpp diff --git a/externals/nitro/modules/c++/pch.h b/modules/c++/pch.h similarity index 100% rename from externals/nitro/modules/c++/pch.h rename to modules/c++/pch.h diff --git a/externals/nitro/modules/c++/wscript b/modules/c++/wscript similarity index 100% rename from externals/nitro/modules/c++/wscript rename to modules/c++/wscript diff --git a/externals/nitro/modules/c/CMakeLists.txt b/modules/c/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/CMakeLists.txt rename to modules/c/CMakeLists.txt diff --git a/externals/nitro/modules/c/cgm/CMakeLists.txt b/modules/c/cgm/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/cgm/CMakeLists.txt rename to modules/c/cgm/CMakeLists.txt diff --git a/externals/nitro/modules/c/cgm/Doxyfile b/modules/c/cgm/Doxyfile similarity index 100% rename from externals/nitro/modules/c/cgm/Doxyfile rename to modules/c/cgm/Doxyfile diff --git a/externals/nitro/modules/c/cgm/include/cgm/BasicTypes.h b/modules/c/cgm/include/cgm/BasicTypes.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/BasicTypes.h rename to modules/c/cgm/include/cgm/BasicTypes.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/CircleElement.h b/modules/c/cgm/include/cgm/CircleElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/CircleElement.h rename to modules/c/cgm/include/cgm/CircleElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/CircularArcCloseElement.h b/modules/c/cgm/include/cgm/CircularArcCloseElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/CircularArcCloseElement.h rename to modules/c/cgm/include/cgm/CircularArcCloseElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/CircularArcElement.h b/modules/c/cgm/include/cgm/CircularArcElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/CircularArcElement.h rename to modules/c/cgm/include/cgm/CircularArcElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Color.h b/modules/c/cgm/include/cgm/Color.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Color.h rename to modules/c/cgm/include/cgm/Color.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Element.h b/modules/c/cgm/include/cgm/Element.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Element.h rename to modules/c/cgm/include/cgm/Element.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/EllipseElement.h b/modules/c/cgm/include/cgm/EllipseElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/EllipseElement.h rename to modules/c/cgm/include/cgm/EllipseElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/EllipticalArcCloseElement.h b/modules/c/cgm/include/cgm/EllipticalArcCloseElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/EllipticalArcCloseElement.h rename to modules/c/cgm/include/cgm/EllipticalArcCloseElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/EllipticalArcElement.h b/modules/c/cgm/include/cgm/EllipticalArcElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/EllipticalArcElement.h rename to modules/c/cgm/include/cgm/EllipticalArcElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/FillAttributes.h b/modules/c/cgm/include/cgm/FillAttributes.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/FillAttributes.h rename to modules/c/cgm/include/cgm/FillAttributes.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/LineAttributes.h b/modules/c/cgm/include/cgm/LineAttributes.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/LineAttributes.h rename to modules/c/cgm/include/cgm/LineAttributes.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Metafile.h b/modules/c/cgm/include/cgm/Metafile.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Metafile.h rename to modules/c/cgm/include/cgm/Metafile.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/MetafileReader.h b/modules/c/cgm/include/cgm/MetafileReader.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/MetafileReader.h rename to modules/c/cgm/include/cgm/MetafileReader.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/MetafileWriter.h b/modules/c/cgm/include/cgm/MetafileWriter.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/MetafileWriter.h rename to modules/c/cgm/include/cgm/MetafileWriter.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/NITFWriteHandler.h b/modules/c/cgm/include/cgm/NITFWriteHandler.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/NITFWriteHandler.h rename to modules/c/cgm/include/cgm/NITFWriteHandler.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Picture.h b/modules/c/cgm/include/cgm/Picture.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Picture.h rename to modules/c/cgm/include/cgm/Picture.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/PictureBody.h b/modules/c/cgm/include/cgm/PictureBody.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/PictureBody.h rename to modules/c/cgm/include/cgm/PictureBody.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/PolyLineElement.h b/modules/c/cgm/include/cgm/PolyLineElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/PolyLineElement.h rename to modules/c/cgm/include/cgm/PolyLineElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/PolySetElement.h b/modules/c/cgm/include/cgm/PolySetElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/PolySetElement.h rename to modules/c/cgm/include/cgm/PolySetElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/PolygonElement.h b/modules/c/cgm/include/cgm/PolygonElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/PolygonElement.h rename to modules/c/cgm/include/cgm/PolygonElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Rectangle.h b/modules/c/cgm/include/cgm/Rectangle.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Rectangle.h rename to modules/c/cgm/include/cgm/Rectangle.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/RectangleElement.h b/modules/c/cgm/include/cgm/RectangleElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/RectangleElement.h rename to modules/c/cgm/include/cgm/RectangleElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Text.h b/modules/c/cgm/include/cgm/Text.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Text.h rename to modules/c/cgm/include/cgm/Text.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/TextAttributes.h b/modules/c/cgm/include/cgm/TextAttributes.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/TextAttributes.h rename to modules/c/cgm/include/cgm/TextAttributes.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/TextElement.h b/modules/c/cgm/include/cgm/TextElement.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/TextElement.h rename to modules/c/cgm/include/cgm/TextElement.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/Vertex.h b/modules/c/cgm/include/cgm/Vertex.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/Vertex.h rename to modules/c/cgm/include/cgm/Vertex.h diff --git a/externals/nitro/modules/c/cgm/include/cgm/VertexClose.h b/modules/c/cgm/include/cgm/VertexClose.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/cgm/VertexClose.h rename to modules/c/cgm/include/cgm/VertexClose.h diff --git a/externals/nitro/modules/c/cgm/include/import/cgm.h b/modules/c/cgm/include/import/cgm.h similarity index 100% rename from externals/nitro/modules/c/cgm/include/import/cgm.h rename to modules/c/cgm/include/import/cgm.h diff --git a/externals/nitro/modules/c/cgm/source/CircleElement.c b/modules/c/cgm/source/CircleElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/CircleElement.c rename to modules/c/cgm/source/CircleElement.c diff --git a/externals/nitro/modules/c/cgm/source/CircularArcCloseElement.c b/modules/c/cgm/source/CircularArcCloseElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/CircularArcCloseElement.c rename to modules/c/cgm/source/CircularArcCloseElement.c diff --git a/externals/nitro/modules/c/cgm/source/CircularArcElement.c b/modules/c/cgm/source/CircularArcElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/CircularArcElement.c rename to modules/c/cgm/source/CircularArcElement.c diff --git a/externals/nitro/modules/c/cgm/source/Color.c b/modules/c/cgm/source/Color.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Color.c rename to modules/c/cgm/source/Color.c diff --git a/externals/nitro/modules/c/cgm/source/Element.c b/modules/c/cgm/source/Element.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Element.c rename to modules/c/cgm/source/Element.c diff --git a/externals/nitro/modules/c/cgm/source/EllipseElement.c b/modules/c/cgm/source/EllipseElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/EllipseElement.c rename to modules/c/cgm/source/EllipseElement.c diff --git a/externals/nitro/modules/c/cgm/source/EllipticalArcCloseElement.c b/modules/c/cgm/source/EllipticalArcCloseElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/EllipticalArcCloseElement.c rename to modules/c/cgm/source/EllipticalArcCloseElement.c diff --git a/externals/nitro/modules/c/cgm/source/EllipticalArcElement.c b/modules/c/cgm/source/EllipticalArcElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/EllipticalArcElement.c rename to modules/c/cgm/source/EllipticalArcElement.c diff --git a/externals/nitro/modules/c/cgm/source/FillAttributes.c b/modules/c/cgm/source/FillAttributes.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/FillAttributes.c rename to modules/c/cgm/source/FillAttributes.c diff --git a/externals/nitro/modules/c/cgm/source/LineAttributes.c b/modules/c/cgm/source/LineAttributes.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/LineAttributes.c rename to modules/c/cgm/source/LineAttributes.c diff --git a/externals/nitro/modules/c/cgm/source/Metafile.c b/modules/c/cgm/source/Metafile.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Metafile.c rename to modules/c/cgm/source/Metafile.c diff --git a/externals/nitro/modules/c/cgm/source/MetafileReader.c b/modules/c/cgm/source/MetafileReader.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/MetafileReader.c rename to modules/c/cgm/source/MetafileReader.c diff --git a/externals/nitro/modules/c/cgm/source/MetafileWriter.c b/modules/c/cgm/source/MetafileWriter.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/MetafileWriter.c rename to modules/c/cgm/source/MetafileWriter.c diff --git a/externals/nitro/modules/c/cgm/source/NITFWriteHandler.c b/modules/c/cgm/source/NITFWriteHandler.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/NITFWriteHandler.c rename to modules/c/cgm/source/NITFWriteHandler.c diff --git a/externals/nitro/modules/c/cgm/source/Picture.c b/modules/c/cgm/source/Picture.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Picture.c rename to modules/c/cgm/source/Picture.c diff --git a/externals/nitro/modules/c/cgm/source/PictureBody.c b/modules/c/cgm/source/PictureBody.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/PictureBody.c rename to modules/c/cgm/source/PictureBody.c diff --git a/externals/nitro/modules/c/cgm/source/PolyLineElement.c b/modules/c/cgm/source/PolyLineElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/PolyLineElement.c rename to modules/c/cgm/source/PolyLineElement.c diff --git a/externals/nitro/modules/c/cgm/source/PolySetElement.c b/modules/c/cgm/source/PolySetElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/PolySetElement.c rename to modules/c/cgm/source/PolySetElement.c diff --git a/externals/nitro/modules/c/cgm/source/PolygonElement.c b/modules/c/cgm/source/PolygonElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/PolygonElement.c rename to modules/c/cgm/source/PolygonElement.c diff --git a/externals/nitro/modules/c/cgm/source/Rectangle.c b/modules/c/cgm/source/Rectangle.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Rectangle.c rename to modules/c/cgm/source/Rectangle.c diff --git a/externals/nitro/modules/c/cgm/source/RectangleElement.c b/modules/c/cgm/source/RectangleElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/RectangleElement.c rename to modules/c/cgm/source/RectangleElement.c diff --git a/externals/nitro/modules/c/cgm/source/Text.c b/modules/c/cgm/source/Text.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Text.c rename to modules/c/cgm/source/Text.c diff --git a/externals/nitro/modules/c/cgm/source/TextAttributes.c b/modules/c/cgm/source/TextAttributes.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/TextAttributes.c rename to modules/c/cgm/source/TextAttributes.c diff --git a/externals/nitro/modules/c/cgm/source/TextElement.c b/modules/c/cgm/source/TextElement.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/TextElement.c rename to modules/c/cgm/source/TextElement.c diff --git a/externals/nitro/modules/c/cgm/source/Vertex.c b/modules/c/cgm/source/Vertex.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/Vertex.c rename to modules/c/cgm/source/Vertex.c diff --git a/externals/nitro/modules/c/cgm/source/VertexClose.c b/modules/c/cgm/source/VertexClose.c similarity index 100% rename from externals/nitro/modules/c/cgm/source/VertexClose.c rename to modules/c/cgm/source/VertexClose.c diff --git a/externals/nitro/modules/c/cgm/tests/test_add_cgm.c b/modules/c/cgm/tests/test_add_cgm.c similarity index 100% rename from externals/nitro/modules/c/cgm/tests/test_add_cgm.c rename to modules/c/cgm/tests/test_add_cgm.c diff --git a/externals/nitro/modules/c/cgm/tests/test_extract_cgm.c b/modules/c/cgm/tests/test_extract_cgm.c similarity index 100% rename from externals/nitro/modules/c/cgm/tests/test_extract_cgm.c rename to modules/c/cgm/tests/test_extract_cgm.c diff --git a/externals/nitro/modules/c/cgm/tests/test_read_cgm.c b/modules/c/cgm/tests/test_read_cgm.c similarity index 100% rename from externals/nitro/modules/c/cgm/tests/test_read_cgm.c rename to modules/c/cgm/tests/test_read_cgm.c diff --git a/externals/nitro/modules/c/cgm/tests/test_rt_cgm.c b/modules/c/cgm/tests/test_rt_cgm.c similarity index 100% rename from externals/nitro/modules/c/cgm/tests/test_rt_cgm.c rename to modules/c/cgm/tests/test_rt_cgm.c diff --git a/externals/nitro/modules/c/cgm/wscript b/modules/c/cgm/wscript similarity index 100% rename from externals/nitro/modules/c/cgm/wscript rename to modules/c/cgm/wscript diff --git a/externals/nitro/modules/c/j2k/CMakeLists.txt b/modules/c/j2k/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/j2k/CMakeLists.txt rename to modules/c/j2k/CMakeLists.txt diff --git a/externals/nitro/modules/c/j2k/J2KCompress.vcxproj b/modules/c/j2k/J2KCompress.vcxproj similarity index 100% rename from externals/nitro/modules/c/j2k/J2KCompress.vcxproj rename to modules/c/j2k/J2KCompress.vcxproj diff --git a/externals/nitro/modules/c/j2k/J2KDecompress.vcxproj b/modules/c/j2k/J2KDecompress.vcxproj similarity index 100% rename from externals/nitro/modules/c/j2k/J2KDecompress.vcxproj rename to modules/c/j2k/J2KDecompress.vcxproj diff --git a/externals/nitro/modules/c/j2k/include/import/j2k.h b/modules/c/j2k/include/import/j2k.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/import/j2k.h rename to modules/c/j2k/include/import/j2k.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Component.h b/modules/c/j2k/include/j2k/Component.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Component.h rename to modules/c/j2k/include/j2k/Component.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Config.h b/modules/c/j2k/include/j2k/Config.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Config.h rename to modules/c/j2k/include/j2k/Config.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Container.h b/modules/c/j2k/include/j2k/Container.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Container.h rename to modules/c/j2k/include/j2k/Container.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Defines.h b/modules/c/j2k/include/j2k/Defines.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Defines.h rename to modules/c/j2k/include/j2k/Defines.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Reader.h b/modules/c/j2k/include/j2k/Reader.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Reader.h rename to modules/c/j2k/include/j2k/Reader.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/TileWriter.h b/modules/c/j2k/include/j2k/TileWriter.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/TileWriter.h rename to modules/c/j2k/include/j2k/TileWriter.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/Writer.h b/modules/c/j2k/include/j2k/Writer.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/Writer.h rename to modules/c/j2k/include/j2k/Writer.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/j2k_Reader.h b/modules/c/j2k/include/j2k/j2k_Reader.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/j2k_Reader.h rename to modules/c/j2k/include/j2k/j2k_Reader.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/j2k_Writer.h b/modules/c/j2k/include/j2k/j2k_Writer.h similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/j2k_Writer.h rename to modules/c/j2k/include/j2k/j2k_Writer.h diff --git a/externals/nitro/modules/c/j2k/include/j2k/j2k_config.h.cmake.in b/modules/c/j2k/include/j2k/j2k_config.h.cmake.in similarity index 100% rename from externals/nitro/modules/c/j2k/include/j2k/j2k_config.h.cmake.in rename to modules/c/j2k/include/j2k/j2k_config.h.cmake.in diff --git a/externals/nitro/modules/c/j2k/shared/J2KCompress.c b/modules/c/j2k/shared/J2KCompress.c similarity index 100% rename from externals/nitro/modules/c/j2k/shared/J2KCompress.c rename to modules/c/j2k/shared/J2KCompress.c diff --git a/externals/nitro/modules/c/j2k/shared/J2KDecompress.c b/modules/c/j2k/shared/J2KDecompress.c similarity index 100% rename from externals/nitro/modules/c/j2k/shared/J2KDecompress.c rename to modules/c/j2k/shared/J2KDecompress.c diff --git a/externals/nitro/modules/c/j2k/shared/wscript b/modules/c/j2k/shared/wscript similarity index 100% rename from externals/nitro/modules/c/j2k/shared/wscript rename to modules/c/j2k/shared/wscript diff --git a/externals/nitro/modules/c/j2k/source/Component.c b/modules/c/j2k/source/Component.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/Component.c rename to modules/c/j2k/source/Component.c diff --git a/externals/nitro/modules/c/j2k/source/Container.c b/modules/c/j2k/source/Container.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/Container.c rename to modules/c/j2k/source/Container.c diff --git a/externals/nitro/modules/c/j2k/source/Defines.c b/modules/c/j2k/source/Defines.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/Defines.c rename to modules/c/j2k/source/Defines.c diff --git a/externals/nitro/modules/c/j2k/source/JasPerImpl.c b/modules/c/j2k/source/JasPerImpl.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/JasPerImpl.c rename to modules/c/j2k/source/JasPerImpl.c diff --git a/externals/nitro/modules/c/j2k/source/KakaduImpl.cpp b/modules/c/j2k/source/KakaduImpl.cpp similarity index 100% rename from externals/nitro/modules/c/j2k/source/KakaduImpl.cpp rename to modules/c/j2k/source/KakaduImpl.cpp diff --git a/externals/nitro/modules/c/j2k/source/OpenJPEGImpl.c b/modules/c/j2k/source/OpenJPEGImpl.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/OpenJPEGImpl.c rename to modules/c/j2k/source/OpenJPEGImpl.c diff --git a/externals/nitro/modules/c/j2k/source/SimpleComponentImpl.c b/modules/c/j2k/source/SimpleComponentImpl.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/SimpleComponentImpl.c rename to modules/c/j2k/source/SimpleComponentImpl.c diff --git a/externals/nitro/modules/c/j2k/source/SimpleContainerImpl.c b/modules/c/j2k/source/SimpleContainerImpl.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/SimpleContainerImpl.c rename to modules/c/j2k/source/SimpleContainerImpl.c diff --git a/externals/nitro/modules/c/j2k/source/TileWriter.c b/modules/c/j2k/source/TileWriter.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/TileWriter.c rename to modules/c/j2k/source/TileWriter.c diff --git a/externals/nitro/modules/c/j2k/source/j2k_Reader.c b/modules/c/j2k/source/j2k_Reader.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/j2k_Reader.c rename to modules/c/j2k/source/j2k_Reader.c diff --git a/externals/nitro/modules/c/j2k/source/j2k_Writer.c b/modules/c/j2k/source/j2k_Writer.c similarity index 100% rename from externals/nitro/modules/c/j2k/source/j2k_Writer.c rename to modules/c/j2k/source/j2k_Writer.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_create.c b/modules/c/j2k/tests/test_j2k_create.c similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_create.c rename to modules/c/j2k/tests/test_j2k_create.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_header.c b/modules/c/j2k/tests/test_j2k_header.c similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_header.c rename to modules/c/j2k/tests/test_j2k_header.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_nitf.c b/modules/c/j2k/tests/test_j2k_nitf.c similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_nitf.c rename to modules/c/j2k/tests/test_j2k_nitf.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_nitf.vcxproj b/modules/c/j2k/tests/test_j2k_nitf.vcxproj similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_nitf.vcxproj rename to modules/c/j2k/tests/test_j2k_nitf.vcxproj diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_read_region.c b/modules/c/j2k/tests/test_j2k_read_region.c similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_read_region.c rename to modules/c/j2k/tests/test_j2k_read_region.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.c b/modules/c/j2k/tests/test_j2k_read_tile.c similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.c rename to modules/c/j2k/tests/test_j2k_read_tile.c diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.vcxproj b/modules/c/j2k/tests/test_j2k_read_tile.vcxproj similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.vcxproj rename to modules/c/j2k/tests/test_j2k_read_tile.vcxproj diff --git a/externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.vcxproj.filters b/modules/c/j2k/tests/test_j2k_read_tile.vcxproj.filters similarity index 100% rename from externals/nitro/modules/c/j2k/tests/test_j2k_read_tile.vcxproj.filters rename to modules/c/j2k/tests/test_j2k_read_tile.vcxproj.filters diff --git a/externals/nitro/modules/c/j2k/wscript b/modules/c/j2k/wscript similarity index 100% rename from externals/nitro/modules/c/j2k/wscript rename to modules/c/j2k/wscript diff --git a/externals/nitro/modules/c/jpeg/CMakeLists.txt b/modules/c/jpeg/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/jpeg/CMakeLists.txt rename to modules/c/jpeg/CMakeLists.txt diff --git a/externals/nitro/modules/c/jpeg/LibjpegDecompress.vcxproj b/modules/c/jpeg/LibjpegDecompress.vcxproj similarity index 100% rename from externals/nitro/modules/c/jpeg/LibjpegDecompress.vcxproj rename to modules/c/jpeg/LibjpegDecompress.vcxproj diff --git a/externals/nitro/modules/c/jpeg/source/LibjpegDecompress.c b/modules/c/jpeg/source/LibjpegDecompress.c similarity index 100% rename from externals/nitro/modules/c/jpeg/source/LibjpegDecompress.c rename to modules/c/jpeg/source/LibjpegDecompress.c diff --git a/externals/nitro/modules/c/jpeg/wscript b/modules/c/jpeg/wscript similarity index 100% rename from externals/nitro/modules/c/jpeg/wscript rename to modules/c/jpeg/wscript diff --git a/externals/nitro/modules/c/nitf-c.vcxproj b/modules/c/nitf-c.vcxproj similarity index 100% rename from externals/nitro/modules/c/nitf-c.vcxproj rename to modules/c/nitf-c.vcxproj diff --git a/externals/nitro/modules/c/nitf-c.vcxproj.filters b/modules/c/nitf-c.vcxproj.filters similarity index 100% rename from externals/nitro/modules/c/nitf-c.vcxproj.filters rename to modules/c/nitf-c.vcxproj.filters diff --git a/externals/nitro/modules/c/nitf/CMakeLists.txt b/modules/c/nitf/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/nitf/CMakeLists.txt rename to modules/c/nitf/CMakeLists.txt diff --git a/externals/nitro/modules/c/nitf/COPYING b/modules/c/nitf/COPYING similarity index 100% rename from externals/nitro/modules/c/nitf/COPYING rename to modules/c/nitf/COPYING diff --git a/externals/nitro/modules/c/nitf/COPYING.LESSER b/modules/c/nitf/COPYING.LESSER similarity index 100% rename from externals/nitro/modules/c/nitf/COPYING.LESSER rename to modules/c/nitf/COPYING.LESSER diff --git a/externals/nitro/modules/c/nitf/Doxyfile b/modules/c/nitf/Doxyfile similarity index 100% rename from externals/nitro/modules/c/nitf/Doxyfile rename to modules/c/nitf/Doxyfile diff --git a/externals/nitro/modules/c/nitf/TEST_DES.vcxproj b/modules/c/nitf/TEST_DES.vcxproj similarity index 100% rename from externals/nitro/modules/c/nitf/TEST_DES.vcxproj rename to modules/c/nitf/TEST_DES.vcxproj diff --git a/externals/nitro/modules/c/nitf/XML_DATA_CONTENT.vcxproj b/modules/c/nitf/XML_DATA_CONTENT.vcxproj similarity index 100% rename from externals/nitro/modules/c/nitf/XML_DATA_CONTENT.vcxproj rename to modules/c/nitf/XML_DATA_CONTENT.vcxproj diff --git a/externals/nitro/modules/c/nitf/apps/get_nitf_version.c b/modules/c/nitf/apps/get_nitf_version.c similarity index 100% rename from externals/nitro/modules/c/nitf/apps/get_nitf_version.c rename to modules/c/nitf/apps/get_nitf_version.c diff --git a/externals/nitro/modules/c/nitf/apps/image_footprint_kml.c b/modules/c/nitf/apps/image_footprint_kml.c similarity index 100% rename from externals/nitro/modules/c/nitf/apps/image_footprint_kml.c rename to modules/c/nitf/apps/image_footprint_kml.c diff --git a/externals/nitro/modules/c/nitf/apps/show_nitf.c b/modules/c/nitf/apps/show_nitf.c similarity index 100% rename from externals/nitro/modules/c/nitf/apps/show_nitf.c rename to modules/c/nitf/apps/show_nitf.c diff --git a/externals/nitro/modules/c/nitf/apps/wscript b/modules/c/nitf/apps/wscript similarity index 100% rename from externals/nitro/modules/c/nitf/apps/wscript rename to modules/c/nitf/apps/wscript diff --git a/externals/nitro/modules/c/nitf/include/import/nitf.h b/modules/c/nitf/include/import/nitf.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/import/nitf.h rename to modules/c/nitf/include/import/nitf.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/BandInfo.h b/modules/c/nitf/include/nitf/BandInfo.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/BandInfo.h rename to modules/c/nitf/include/nitf/BandInfo.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/BandSource.h b/modules/c/nitf/include/nitf/BandSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/BandSource.h rename to modules/c/nitf/include/nitf/BandSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ComplexityLevel.h b/modules/c/nitf/include/nitf/ComplexityLevel.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ComplexityLevel.h rename to modules/c/nitf/include/nitf/ComplexityLevel.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ComponentInfo.h b/modules/c/nitf/include/nitf/ComponentInfo.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ComponentInfo.h rename to modules/c/nitf/include/nitf/ComponentInfo.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Config.h b/modules/c/nitf/include/nitf/Config.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Config.h rename to modules/c/nitf/include/nitf/Config.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DESegment.h b/modules/c/nitf/include/nitf/DESegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DESegment.h rename to modules/c/nitf/include/nitf/DESegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DESubheader.h b/modules/c/nitf/include/nitf/DESubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DESubheader.h rename to modules/c/nitf/include/nitf/DESubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DataSource.h b/modules/c/nitf/include/nitf/DataSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DataSource.h rename to modules/c/nitf/include/nitf/DataSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DefaultTRE.h b/modules/c/nitf/include/nitf/DefaultTRE.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DefaultTRE.h rename to modules/c/nitf/include/nitf/DefaultTRE.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Defines.h b/modules/c/nitf/include/nitf/Defines.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Defines.h rename to modules/c/nitf/include/nitf/Defines.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DirectBlockSource.h b/modules/c/nitf/include/nitf/DirectBlockSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DirectBlockSource.h rename to modules/c/nitf/include/nitf/DirectBlockSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/DownSampler.h b/modules/c/nitf/include/nitf/DownSampler.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/DownSampler.h rename to modules/c/nitf/include/nitf/DownSampler.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Extensions.h b/modules/c/nitf/include/nitf/Extensions.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Extensions.h rename to modules/c/nitf/include/nitf/Extensions.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Field.h b/modules/c/nitf/include/nitf/Field.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Field.h rename to modules/c/nitf/include/nitf/Field.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/FieldDescriptor.h b/modules/c/nitf/include/nitf/FieldDescriptor.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/FieldDescriptor.h rename to modules/c/nitf/include/nitf/FieldDescriptor.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/FieldWarning.h b/modules/c/nitf/include/nitf/FieldWarning.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/FieldWarning.h rename to modules/c/nitf/include/nitf/FieldWarning.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/FileHeader.h b/modules/c/nitf/include/nitf/FileHeader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/FileHeader.h rename to modules/c/nitf/include/nitf/FileHeader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/FileSecurity.h b/modules/c/nitf/include/nitf/FileSecurity.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/FileSecurity.h rename to modules/c/nitf/include/nitf/FileSecurity.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/GraphicSegment.h b/modules/c/nitf/include/nitf/GraphicSegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/GraphicSegment.h rename to modules/c/nitf/include/nitf/GraphicSegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/GraphicSubheader.h b/modules/c/nitf/include/nitf/GraphicSubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/GraphicSubheader.h rename to modules/c/nitf/include/nitf/GraphicSubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageIO.h b/modules/c/nitf/include/nitf/ImageIO.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageIO.h rename to modules/c/nitf/include/nitf/ImageIO.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageReader.h b/modules/c/nitf/include/nitf/ImageReader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageReader.h rename to modules/c/nitf/include/nitf/ImageReader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageSegment.h b/modules/c/nitf/include/nitf/ImageSegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageSegment.h rename to modules/c/nitf/include/nitf/ImageSegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageSource.h b/modules/c/nitf/include/nitf/ImageSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageSource.h rename to modules/c/nitf/include/nitf/ImageSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageSubheader.h b/modules/c/nitf/include/nitf/ImageSubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageSubheader.h rename to modules/c/nitf/include/nitf/ImageSubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/ImageWriter.h b/modules/c/nitf/include/nitf/ImageWriter.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/ImageWriter.h rename to modules/c/nitf/include/nitf/ImageWriter.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/LabelSegment.h b/modules/c/nitf/include/nitf/LabelSegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/LabelSegment.h rename to modules/c/nitf/include/nitf/LabelSegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/LabelSubheader.h b/modules/c/nitf/include/nitf/LabelSubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/LabelSubheader.h rename to modules/c/nitf/include/nitf/LabelSubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/LookupTable.h b/modules/c/nitf/include/nitf/LookupTable.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/LookupTable.h rename to modules/c/nitf/include/nitf/LookupTable.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/NitfReader.h b/modules/c/nitf/include/nitf/NitfReader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/NitfReader.h rename to modules/c/nitf/include/nitf/NitfReader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/NitfWriter.h b/modules/c/nitf/include/nitf/NitfWriter.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/NitfWriter.h rename to modules/c/nitf/include/nitf/NitfWriter.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/PluginIdentifier.h b/modules/c/nitf/include/nitf/PluginIdentifier.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/PluginIdentifier.h rename to modules/c/nitf/include/nitf/PluginIdentifier.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/PluginRegistry.h b/modules/c/nitf/include/nitf/PluginRegistry.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/PluginRegistry.h rename to modules/c/nitf/include/nitf/PluginRegistry.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/RESegment.h b/modules/c/nitf/include/nitf/RESegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/RESegment.h rename to modules/c/nitf/include/nitf/RESegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/RESubheader.h b/modules/c/nitf/include/nitf/RESubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/RESubheader.h rename to modules/c/nitf/include/nitf/RESubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Reader.h b/modules/c/nitf/include/nitf/Reader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Reader.h rename to modules/c/nitf/include/nitf/Reader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Record.h b/modules/c/nitf/include/nitf/Record.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Record.h rename to modules/c/nitf/include/nitf/Record.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/RowSource.h b/modules/c/nitf/include/nitf/RowSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/RowSource.h rename to modules/c/nitf/include/nitf/RowSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/SegmentReader.h b/modules/c/nitf/include/nitf/SegmentReader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/SegmentReader.h rename to modules/c/nitf/include/nitf/SegmentReader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/SegmentSource.h b/modules/c/nitf/include/nitf/SegmentSource.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/SegmentSource.h rename to modules/c/nitf/include/nitf/SegmentSource.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/SegmentWriter.h b/modules/c/nitf/include/nitf/SegmentWriter.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/SegmentWriter.h rename to modules/c/nitf/include/nitf/SegmentWriter.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/StreamIOWriteHandler.h b/modules/c/nitf/include/nitf/StreamIOWriteHandler.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/StreamIOWriteHandler.h rename to modules/c/nitf/include/nitf/StreamIOWriteHandler.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/SubWindow.h b/modules/c/nitf/include/nitf/SubWindow.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/SubWindow.h rename to modules/c/nitf/include/nitf/SubWindow.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/System.h b/modules/c/nitf/include/nitf/System.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/System.h rename to modules/c/nitf/include/nitf/System.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TRE.h b/modules/c/nitf/include/nitf/TRE.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TRE.h rename to modules/c/nitf/include/nitf/TRE.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TRECursor.h b/modules/c/nitf/include/nitf/TRECursor.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TRECursor.h rename to modules/c/nitf/include/nitf/TRECursor.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TREDescription.h b/modules/c/nitf/include/nitf/TREDescription.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TREDescription.h rename to modules/c/nitf/include/nitf/TREDescription.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TREPrivateData.h b/modules/c/nitf/include/nitf/TREPrivateData.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TREPrivateData.h rename to modules/c/nitf/include/nitf/TREPrivateData.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TREUtils.h b/modules/c/nitf/include/nitf/TREUtils.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TREUtils.h rename to modules/c/nitf/include/nitf/TREUtils.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TestingTest.h b/modules/c/nitf/include/nitf/TestingTest.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TestingTest.h rename to modules/c/nitf/include/nitf/TestingTest.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TextSegment.h b/modules/c/nitf/include/nitf/TextSegment.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TextSegment.h rename to modules/c/nitf/include/nitf/TextSegment.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/TextSubheader.h b/modules/c/nitf/include/nitf/TextSubheader.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/TextSubheader.h rename to modules/c/nitf/include/nitf/TextSubheader.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Types.h b/modules/c/nitf/include/nitf/Types.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Types.h rename to modules/c/nitf/include/nitf/Types.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Version.h b/modules/c/nitf/include/nitf/Version.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Version.h rename to modules/c/nitf/include/nitf/Version.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/WriteHandler.h b/modules/c/nitf/include/nitf/WriteHandler.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/WriteHandler.h rename to modules/c/nitf/include/nitf/WriteHandler.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/Writer.h b/modules/c/nitf/include/nitf/Writer.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/Writer.h rename to modules/c/nitf/include/nitf/Writer.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/WriterOptions.h b/modules/c/nitf/include/nitf/WriterOptions.h similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/WriterOptions.h rename to modules/c/nitf/include/nitf/WriterOptions.h diff --git a/externals/nitro/modules/c/nitf/include/nitf/nitf_config.h.cmake.in b/modules/c/nitf/include/nitf/nitf_config.h.cmake.in similarity index 100% rename from externals/nitro/modules/c/nitf/include/nitf/nitf_config.h.cmake.in rename to modules/c/nitf/include/nitf/nitf_config.h.cmake.in diff --git a/externals/nitro/modules/c/nitf/shared/ACCHZB.c b/modules/c/nitf/shared/ACCHZB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ACCHZB.c rename to modules/c/nitf/shared/ACCHZB.c diff --git a/externals/nitro/modules/c/nitf/shared/ACCPOB.c b/modules/c/nitf/shared/ACCPOB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ACCPOB.c rename to modules/c/nitf/shared/ACCPOB.c diff --git a/externals/nitro/modules/c/nitf/shared/ACCVTB.c b/modules/c/nitf/shared/ACCVTB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ACCVTB.c rename to modules/c/nitf/shared/ACCVTB.c diff --git a/externals/nitro/modules/c/nitf/shared/ACFTA.c b/modules/c/nitf/shared/ACFTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ACFTA.c rename to modules/c/nitf/shared/ACFTA.c diff --git a/externals/nitro/modules/c/nitf/shared/ACFTB.c b/modules/c/nitf/shared/ACFTB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ACFTB.c rename to modules/c/nitf/shared/ACFTB.c diff --git a/externals/nitro/modules/c/nitf/shared/AIMIDA.c b/modules/c/nitf/shared/AIMIDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/AIMIDA.c rename to modules/c/nitf/shared/AIMIDA.c diff --git a/externals/nitro/modules/c/nitf/shared/AIMIDB.c b/modules/c/nitf/shared/AIMIDB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/AIMIDB.c rename to modules/c/nitf/shared/AIMIDB.c diff --git a/externals/nitro/modules/c/nitf/shared/AIPBCA.c b/modules/c/nitf/shared/AIPBCA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/AIPBCA.c rename to modules/c/nitf/shared/AIPBCA.c diff --git a/externals/nitro/modules/c/nitf/shared/ASTORA.c b/modules/c/nitf/shared/ASTORA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ASTORA.c rename to modules/c/nitf/shared/ASTORA.c diff --git a/externals/nitro/modules/c/nitf/shared/BANDSA.c b/modules/c/nitf/shared/BANDSA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/BANDSA.c rename to modules/c/nitf/shared/BANDSA.c diff --git a/externals/nitro/modules/c/nitf/shared/BANDSB.c b/modules/c/nitf/shared/BANDSB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/BANDSB.c rename to modules/c/nitf/shared/BANDSB.c diff --git a/externals/nitro/modules/c/nitf/shared/BCKGDA.c b/modules/c/nitf/shared/BCKGDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/BCKGDA.c rename to modules/c/nitf/shared/BCKGDA.c diff --git a/externals/nitro/modules/c/nitf/shared/BLOCKA.c b/modules/c/nitf/shared/BLOCKA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/BLOCKA.c rename to modules/c/nitf/shared/BLOCKA.c diff --git a/externals/nitro/modules/c/nitf/shared/BNDPLB.c b/modules/c/nitf/shared/BNDPLB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/BNDPLB.c rename to modules/c/nitf/shared/BNDPLB.c diff --git a/externals/nitro/modules/c/nitf/shared/CCINFA.c b/modules/c/nitf/shared/CCINFA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CCINFA.c rename to modules/c/nitf/shared/CCINFA.c diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNA.c b/modules/c/nitf/shared/CLCTNA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CLCTNA.c rename to modules/c/nitf/shared/CLCTNA.c diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNB.c b/modules/c/nitf/shared/CLCTNB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CLCTNB.c rename to modules/c/nitf/shared/CLCTNB.c diff --git a/externals/nitro/modules/c/nitf/shared/CMETAA.c b/modules/c/nitf/shared/CMETAA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CMETAA.c rename to modules/c/nitf/shared/CMETAA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSATTB.c b/modules/c/nitf/shared/CSATTB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSATTB.c rename to modules/c/nitf/shared/CSATTB.c diff --git a/externals/nitro/modules/c/nitf/shared/CSCCGA.c b/modules/c/nitf/shared/CSCCGA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSCCGA.c rename to modules/c/nitf/shared/CSCCGA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSCRNA.c b/modules/c/nitf/shared/CSCRNA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSCRNA.c rename to modules/c/nitf/shared/CSCRNA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSDIDA.c b/modules/c/nitf/shared/CSDIDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSDIDA.c rename to modules/c/nitf/shared/CSDIDA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSEPHA.c b/modules/c/nitf/shared/CSEPHA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSEPHA.c rename to modules/c/nitf/shared/CSEPHA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSEXRA.c b/modules/c/nitf/shared/CSEXRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSEXRA.c rename to modules/c/nitf/shared/CSEXRA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSEXRB.c b/modules/c/nitf/shared/CSEXRB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSEXRB.c rename to modules/c/nitf/shared/CSEXRB.c diff --git a/externals/nitro/modules/c/nitf/shared/CSPROA.c b/modules/c/nitf/shared/CSPROA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSPROA.c rename to modules/c/nitf/shared/CSPROA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSSFAA.c b/modules/c/nitf/shared/CSSFAA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSSFAA.c rename to modules/c/nitf/shared/CSSFAA.c diff --git a/externals/nitro/modules/c/nitf/shared/CSSHPA.c b/modules/c/nitf/shared/CSSHPA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/CSSHPA.c rename to modules/c/nitf/shared/CSSHPA.c diff --git a/externals/nitro/modules/c/nitf/shared/ENGRDA.c b/modules/c/nitf/shared/ENGRDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ENGRDA.c rename to modules/c/nitf/shared/ENGRDA.c diff --git a/externals/nitro/modules/c/nitf/shared/EXOPTA.c b/modules/c/nitf/shared/EXOPTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/EXOPTA.c rename to modules/c/nitf/shared/EXOPTA.c diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTA.c b/modules/c/nitf/shared/EXPLTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/EXPLTA.c rename to modules/c/nitf/shared/EXPLTA.c diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTB.c b/modules/c/nitf/shared/EXPLTB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/EXPLTB.c rename to modules/c/nitf/shared/EXPLTB.c diff --git a/externals/nitro/modules/c/nitf/shared/GEOLOB.c b/modules/c/nitf/shared/GEOLOB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/GEOLOB.c rename to modules/c/nitf/shared/GEOLOB.c diff --git a/externals/nitro/modules/c/nitf/shared/GEOPSB.c b/modules/c/nitf/shared/GEOPSB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/GEOPSB.c rename to modules/c/nitf/shared/GEOPSB.c diff --git a/externals/nitro/modules/c/nitf/shared/GRDPSB.c b/modules/c/nitf/shared/GRDPSB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/GRDPSB.c rename to modules/c/nitf/shared/GRDPSB.c diff --git a/externals/nitro/modules/c/nitf/shared/HISTOA.c b/modules/c/nitf/shared/HISTOA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/HISTOA.c rename to modules/c/nitf/shared/HISTOA.c diff --git a/externals/nitro/modules/c/nitf/shared/ICHIPB.c b/modules/c/nitf/shared/ICHIPB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/ICHIPB.c rename to modules/c/nitf/shared/ICHIPB.c diff --git a/externals/nitro/modules/c/nitf/shared/IMASDA.c b/modules/c/nitf/shared/IMASDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/IMASDA.c rename to modules/c/nitf/shared/IMASDA.c diff --git a/externals/nitro/modules/c/nitf/shared/IMGDTA.c b/modules/c/nitf/shared/IMGDTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/IMGDTA.c rename to modules/c/nitf/shared/IMGDTA.c diff --git a/externals/nitro/modules/c/nitf/shared/IMRFCA.c b/modules/c/nitf/shared/IMRFCA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/IMRFCA.c rename to modules/c/nitf/shared/IMRFCA.c diff --git a/externals/nitro/modules/c/nitf/shared/IOMAPA.c b/modules/c/nitf/shared/IOMAPA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/IOMAPA.c rename to modules/c/nitf/shared/IOMAPA.c diff --git a/externals/nitro/modules/c/nitf/shared/J2KLRA.c b/modules/c/nitf/shared/J2KLRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/J2KLRA.c rename to modules/c/nitf/shared/J2KLRA.c diff --git a/externals/nitro/modules/c/nitf/shared/JITCID.c b/modules/c/nitf/shared/JITCID.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/JITCID.c rename to modules/c/nitf/shared/JITCID.c diff --git a/externals/nitro/modules/c/nitf/shared/MAPLOB.c b/modules/c/nitf/shared/MAPLOB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MAPLOB.c rename to modules/c/nitf/shared/MAPLOB.c diff --git a/externals/nitro/modules/c/nitf/shared/MATESA.c b/modules/c/nitf/shared/MATESA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MATESA.c rename to modules/c/nitf/shared/MATESA.c diff --git a/externals/nitro/modules/c/nitf/shared/MENSRA.c b/modules/c/nitf/shared/MENSRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MENSRA.c rename to modules/c/nitf/shared/MENSRA.c diff --git a/externals/nitro/modules/c/nitf/shared/MENSRB.c b/modules/c/nitf/shared/MENSRB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MENSRB.c rename to modules/c/nitf/shared/MENSRB.c diff --git a/externals/nitro/modules/c/nitf/shared/MPDSRA.c b/modules/c/nitf/shared/MPDSRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MPDSRA.c rename to modules/c/nitf/shared/MPDSRA.c diff --git a/externals/nitro/modules/c/nitf/shared/MSDIRA.c b/modules/c/nitf/shared/MSDIRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MSDIRA.c rename to modules/c/nitf/shared/MSDIRA.c diff --git a/externals/nitro/modules/c/nitf/shared/MSTGTA.c b/modules/c/nitf/shared/MSTGTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MSTGTA.c rename to modules/c/nitf/shared/MSTGTA.c diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPA.c b/modules/c/nitf/shared/MTIRPA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MTIRPA.c rename to modules/c/nitf/shared/MTIRPA.c diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPB.c b/modules/c/nitf/shared/MTIRPB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/MTIRPB.c rename to modules/c/nitf/shared/MTIRPB.c diff --git a/externals/nitro/modules/c/nitf/shared/NBLOCA.c b/modules/c/nitf/shared/NBLOCA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/NBLOCA.c rename to modules/c/nitf/shared/NBLOCA.c diff --git a/externals/nitro/modules/c/nitf/shared/OBJCTA.c b/modules/c/nitf/shared/OBJCTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/OBJCTA.c rename to modules/c/nitf/shared/OBJCTA.c diff --git a/externals/nitro/modules/c/nitf/shared/OFFSET.c b/modules/c/nitf/shared/OFFSET.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/OFFSET.c rename to modules/c/nitf/shared/OFFSET.c diff --git a/externals/nitro/modules/c/nitf/shared/PATCHA.c b/modules/c/nitf/shared/PATCHA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PATCHA.c rename to modules/c/nitf/shared/PATCHA.c diff --git a/externals/nitro/modules/c/nitf/shared/PATCHB.c b/modules/c/nitf/shared/PATCHB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PATCHB.c rename to modules/c/nitf/shared/PATCHB.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAEQA.c b/modules/c/nitf/shared/PIAEQA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAEQA.c rename to modules/c/nitf/shared/PIAEQA.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAEVA.c b/modules/c/nitf/shared/PIAEVA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAEVA.c rename to modules/c/nitf/shared/PIAEVA.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMB.c b/modules/c/nitf/shared/PIAIMB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAIMB.c rename to modules/c/nitf/shared/PIAIMB.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMC.c b/modules/c/nitf/shared/PIAIMC.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAIMC.c rename to modules/c/nitf/shared/PIAIMC.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEA.c b/modules/c/nitf/shared/PIAPEA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAPEA.c rename to modules/c/nitf/shared/PIAPEA.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEB.c b/modules/c/nitf/shared/PIAPEB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAPEB.c rename to modules/c/nitf/shared/PIAPEB.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRC.c b/modules/c/nitf/shared/PIAPRC.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAPRC.c rename to modules/c/nitf/shared/PIAPRC.c diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRD.c b/modules/c/nitf/shared/PIAPRD.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIAPRD.c rename to modules/c/nitf/shared/PIAPRD.c diff --git a/externals/nitro/modules/c/nitf/shared/PIATGA.c b/modules/c/nitf/shared/PIATGA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIATGA.c rename to modules/c/nitf/shared/PIATGA.c diff --git a/externals/nitro/modules/c/nitf/shared/PIATGB.c b/modules/c/nitf/shared/PIATGB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIATGB.c rename to modules/c/nitf/shared/PIATGB.c diff --git a/externals/nitro/modules/c/nitf/shared/PIXMTA.c b/modules/c/nitf/shared/PIXMTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIXMTA.c rename to modules/c/nitf/shared/PIXMTA.c diff --git a/externals/nitro/modules/c/nitf/shared/PIXQLA.c b/modules/c/nitf/shared/PIXQLA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PIXQLA.c rename to modules/c/nitf/shared/PIXQLA.c diff --git a/externals/nitro/modules/c/nitf/shared/PLTFMA.c b/modules/c/nitf/shared/PLTFMA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PLTFMA.c rename to modules/c/nitf/shared/PLTFMA.c diff --git a/externals/nitro/modules/c/nitf/shared/PRADAA.c b/modules/c/nitf/shared/PRADAA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PRADAA.c rename to modules/c/nitf/shared/PRADAA.c diff --git a/externals/nitro/modules/c/nitf/shared/PRJPSB.c b/modules/c/nitf/shared/PRJPSB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PRJPSB.c rename to modules/c/nitf/shared/PRJPSB.c diff --git a/externals/nitro/modules/c/nitf/shared/PTPRAA.c b/modules/c/nitf/shared/PTPRAA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/PTPRAA.c rename to modules/c/nitf/shared/PTPRAA.c diff --git a/externals/nitro/modules/c/nitf/shared/REGPTB.c b/modules/c/nitf/shared/REGPTB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/REGPTB.c rename to modules/c/nitf/shared/REGPTB.c diff --git a/externals/nitro/modules/c/nitf/shared/RPC00B.c b/modules/c/nitf/shared/RPC00B.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RPC00B.c rename to modules/c/nitf/shared/RPC00B.c diff --git a/externals/nitro/modules/c/nitf/shared/RPFDES.c b/modules/c/nitf/shared/RPFDES.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RPFDES.c rename to modules/c/nitf/shared/RPFDES.c diff --git a/externals/nitro/modules/c/nitf/shared/RPFHDR.c b/modules/c/nitf/shared/RPFHDR.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RPFHDR.c rename to modules/c/nitf/shared/RPFHDR.c diff --git a/externals/nitro/modules/c/nitf/shared/RPFIMG.c b/modules/c/nitf/shared/RPFIMG.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RPFIMG.c rename to modules/c/nitf/shared/RPFIMG.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMAPA.c b/modules/c/nitf/shared/RSMAPA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMAPA.c rename to modules/c/nitf/shared/RSMAPA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMDCA.c b/modules/c/nitf/shared/RSMDCA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMDCA.c rename to modules/c/nitf/shared/RSMDCA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMECA.c b/modules/c/nitf/shared/RSMECA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMECA.c rename to modules/c/nitf/shared/RSMECA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMGGA.c b/modules/c/nitf/shared/RSMGGA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMGGA.c rename to modules/c/nitf/shared/RSMGGA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMGIA.c b/modules/c/nitf/shared/RSMGIA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMGIA.c rename to modules/c/nitf/shared/RSMGIA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMIDA.c b/modules/c/nitf/shared/RSMIDA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMIDA.c rename to modules/c/nitf/shared/RSMIDA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMPCA.c b/modules/c/nitf/shared/RSMPCA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMPCA.c rename to modules/c/nitf/shared/RSMPCA.c diff --git a/externals/nitro/modules/c/nitf/shared/RSMPIA.c b/modules/c/nitf/shared/RSMPIA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/RSMPIA.c rename to modules/c/nitf/shared/RSMPIA.c diff --git a/externals/nitro/modules/c/nitf/shared/SECTGA.c b/modules/c/nitf/shared/SECTGA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SECTGA.c rename to modules/c/nitf/shared/SECTGA.c diff --git a/externals/nitro/modules/c/nitf/shared/SECURA.c b/modules/c/nitf/shared/SECURA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SECURA.c rename to modules/c/nitf/shared/SECURA.c diff --git a/externals/nitro/modules/c/nitf/shared/SENSRA.c b/modules/c/nitf/shared/SENSRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SENSRA.c rename to modules/c/nitf/shared/SENSRA.c diff --git a/externals/nitro/modules/c/nitf/shared/SENSRB.c b/modules/c/nitf/shared/SENSRB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SENSRB.c rename to modules/c/nitf/shared/SENSRB.c diff --git a/externals/nitro/modules/c/nitf/shared/SNSPSB.c b/modules/c/nitf/shared/SNSPSB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SNSPSB.c rename to modules/c/nitf/shared/SNSPSB.c diff --git a/externals/nitro/modules/c/nitf/shared/SNSRA.c b/modules/c/nitf/shared/SNSRA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SNSRA.c rename to modules/c/nitf/shared/SNSRA.c diff --git a/externals/nitro/modules/c/nitf/shared/SOURCB.c b/modules/c/nitf/shared/SOURCB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/SOURCB.c rename to modules/c/nitf/shared/SOURCB.c diff --git a/externals/nitro/modules/c/nitf/shared/STDIDC.c b/modules/c/nitf/shared/STDIDC.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/STDIDC.c rename to modules/c/nitf/shared/STDIDC.c diff --git a/externals/nitro/modules/c/nitf/shared/STEROB.c b/modules/c/nitf/shared/STEROB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/STEROB.c rename to modules/c/nitf/shared/STEROB.c diff --git a/externals/nitro/modules/c/nitf/shared/STREOB.c b/modules/c/nitf/shared/STREOB.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/STREOB.c rename to modules/c/nitf/shared/STREOB.c diff --git a/externals/nitro/modules/c/nitf/shared/TEST_DES.c b/modules/c/nitf/shared/TEST_DES.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/TEST_DES.c rename to modules/c/nitf/shared/TEST_DES.c diff --git a/externals/nitro/modules/c/nitf/shared/TRGTA.c b/modules/c/nitf/shared/TRGTA.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/TRGTA.c rename to modules/c/nitf/shared/TRGTA.c diff --git a/externals/nitro/modules/c/nitf/shared/USE00A.c b/modules/c/nitf/shared/USE00A.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/USE00A.c rename to modules/c/nitf/shared/USE00A.c diff --git a/externals/nitro/modules/c/nitf/shared/XML_DATA_CONTENT.c b/modules/c/nitf/shared/XML_DATA_CONTENT.c similarity index 100% rename from externals/nitro/modules/c/nitf/shared/XML_DATA_CONTENT.c rename to modules/c/nitf/shared/XML_DATA_CONTENT.c diff --git a/externals/nitro/modules/c/nitf/shared/wscript b/modules/c/nitf/shared/wscript similarity index 100% rename from externals/nitro/modules/c/nitf/shared/wscript rename to modules/c/nitf/shared/wscript diff --git a/externals/nitro/modules/c/nitf/source/BandInfo.c b/modules/c/nitf/source/BandInfo.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/BandInfo.c rename to modules/c/nitf/source/BandInfo.c diff --git a/externals/nitro/modules/c/nitf/source/BandSource.c b/modules/c/nitf/source/BandSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/BandSource.c rename to modules/c/nitf/source/BandSource.c diff --git a/externals/nitro/modules/c/nitf/source/ComplexityLevel.c b/modules/c/nitf/source/ComplexityLevel.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ComplexityLevel.c rename to modules/c/nitf/source/ComplexityLevel.c diff --git a/externals/nitro/modules/c/nitf/source/ComponentInfo.c b/modules/c/nitf/source/ComponentInfo.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ComponentInfo.c rename to modules/c/nitf/source/ComponentInfo.c diff --git a/externals/nitro/modules/c/nitf/source/DESegment.c b/modules/c/nitf/source/DESegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DESegment.c rename to modules/c/nitf/source/DESegment.c diff --git a/externals/nitro/modules/c/nitf/source/DESubheader.c b/modules/c/nitf/source/DESubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DESubheader.c rename to modules/c/nitf/source/DESubheader.c diff --git a/externals/nitro/modules/c/nitf/source/DataSource.c b/modules/c/nitf/source/DataSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DataSource.c rename to modules/c/nitf/source/DataSource.c diff --git a/externals/nitro/modules/c/nitf/source/DefaultTRE.c b/modules/c/nitf/source/DefaultTRE.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DefaultTRE.c rename to modules/c/nitf/source/DefaultTRE.c diff --git a/externals/nitro/modules/c/nitf/source/DirectBlockSource.c b/modules/c/nitf/source/DirectBlockSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DirectBlockSource.c rename to modules/c/nitf/source/DirectBlockSource.c diff --git a/externals/nitro/modules/c/nitf/source/DownSampler.c b/modules/c/nitf/source/DownSampler.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/DownSampler.c rename to modules/c/nitf/source/DownSampler.c diff --git a/externals/nitro/modules/c/nitf/source/Extensions.c b/modules/c/nitf/source/Extensions.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/Extensions.c rename to modules/c/nitf/source/Extensions.c diff --git a/externals/nitro/modules/c/nitf/source/Field.c b/modules/c/nitf/source/Field.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/Field.c rename to modules/c/nitf/source/Field.c diff --git a/externals/nitro/modules/c/nitf/source/FieldWarning.c b/modules/c/nitf/source/FieldWarning.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/FieldWarning.c rename to modules/c/nitf/source/FieldWarning.c diff --git a/externals/nitro/modules/c/nitf/source/FileHeader.c b/modules/c/nitf/source/FileHeader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/FileHeader.c rename to modules/c/nitf/source/FileHeader.c diff --git a/externals/nitro/modules/c/nitf/source/FileSecurity.c b/modules/c/nitf/source/FileSecurity.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/FileSecurity.c rename to modules/c/nitf/source/FileSecurity.c diff --git a/externals/nitro/modules/c/nitf/source/GraphicSegment.c b/modules/c/nitf/source/GraphicSegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/GraphicSegment.c rename to modules/c/nitf/source/GraphicSegment.c diff --git a/externals/nitro/modules/c/nitf/source/GraphicSubheader.c b/modules/c/nitf/source/GraphicSubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/GraphicSubheader.c rename to modules/c/nitf/source/GraphicSubheader.c diff --git a/externals/nitro/modules/c/nitf/source/ImageIO.c b/modules/c/nitf/source/ImageIO.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageIO.c rename to modules/c/nitf/source/ImageIO.c diff --git a/externals/nitro/modules/c/nitf/source/ImageReader.c b/modules/c/nitf/source/ImageReader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageReader.c rename to modules/c/nitf/source/ImageReader.c diff --git a/externals/nitro/modules/c/nitf/source/ImageSegment.c b/modules/c/nitf/source/ImageSegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageSegment.c rename to modules/c/nitf/source/ImageSegment.c diff --git a/externals/nitro/modules/c/nitf/source/ImageSource.c b/modules/c/nitf/source/ImageSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageSource.c rename to modules/c/nitf/source/ImageSource.c diff --git a/externals/nitro/modules/c/nitf/source/ImageSubheader.c b/modules/c/nitf/source/ImageSubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageSubheader.c rename to modules/c/nitf/source/ImageSubheader.c diff --git a/externals/nitro/modules/c/nitf/source/ImageWriter.c b/modules/c/nitf/source/ImageWriter.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/ImageWriter.c rename to modules/c/nitf/source/ImageWriter.c diff --git a/externals/nitro/modules/c/nitf/source/LabelSegment.c b/modules/c/nitf/source/LabelSegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/LabelSegment.c rename to modules/c/nitf/source/LabelSegment.c diff --git a/externals/nitro/modules/c/nitf/source/LabelSubheader.c b/modules/c/nitf/source/LabelSubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/LabelSubheader.c rename to modules/c/nitf/source/LabelSubheader.c diff --git a/externals/nitro/modules/c/nitf/source/LookupTable.c b/modules/c/nitf/source/LookupTable.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/LookupTable.c rename to modules/c/nitf/source/LookupTable.c diff --git a/externals/nitro/modules/c/nitf/source/NitfReader.c b/modules/c/nitf/source/NitfReader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/NitfReader.c rename to modules/c/nitf/source/NitfReader.c diff --git a/externals/nitro/modules/c/nitf/source/NitfSystem.c b/modules/c/nitf/source/NitfSystem.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/NitfSystem.c rename to modules/c/nitf/source/NitfSystem.c diff --git a/externals/nitro/modules/c/nitf/source/NitfWriter.c b/modules/c/nitf/source/NitfWriter.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/NitfWriter.c rename to modules/c/nitf/source/NitfWriter.c diff --git a/externals/nitro/modules/c/nitf/source/PluginRegistry.c b/modules/c/nitf/source/PluginRegistry.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/PluginRegistry.c rename to modules/c/nitf/source/PluginRegistry.c diff --git a/externals/nitro/modules/c/nitf/source/RESegment.c b/modules/c/nitf/source/RESegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/RESegment.c rename to modules/c/nitf/source/RESegment.c diff --git a/externals/nitro/modules/c/nitf/source/RESubheader.c b/modules/c/nitf/source/RESubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/RESubheader.c rename to modules/c/nitf/source/RESubheader.c diff --git a/externals/nitro/modules/c/nitf/source/Record.c b/modules/c/nitf/source/Record.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/Record.c rename to modules/c/nitf/source/Record.c diff --git a/externals/nitro/modules/c/nitf/source/RowSource.c b/modules/c/nitf/source/RowSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/RowSource.c rename to modules/c/nitf/source/RowSource.c diff --git a/externals/nitro/modules/c/nitf/source/SegmentReader.c b/modules/c/nitf/source/SegmentReader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/SegmentReader.c rename to modules/c/nitf/source/SegmentReader.c diff --git a/externals/nitro/modules/c/nitf/source/SegmentSource.c b/modules/c/nitf/source/SegmentSource.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/SegmentSource.c rename to modules/c/nitf/source/SegmentSource.c diff --git a/externals/nitro/modules/c/nitf/source/SegmentWriter.c b/modules/c/nitf/source/SegmentWriter.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/SegmentWriter.c rename to modules/c/nitf/source/SegmentWriter.c diff --git a/externals/nitro/modules/c/nitf/source/StreamIOWriteHandler.c b/modules/c/nitf/source/StreamIOWriteHandler.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/StreamIOWriteHandler.c rename to modules/c/nitf/source/StreamIOWriteHandler.c diff --git a/externals/nitro/modules/c/nitf/source/SubWindow.c b/modules/c/nitf/source/SubWindow.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/SubWindow.c rename to modules/c/nitf/source/SubWindow.c diff --git a/externals/nitro/modules/c/nitf/source/TRE.c b/modules/c/nitf/source/TRE.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TRE.c rename to modules/c/nitf/source/TRE.c diff --git a/externals/nitro/modules/c/nitf/source/TRECursor.c b/modules/c/nitf/source/TRECursor.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TRECursor.c rename to modules/c/nitf/source/TRECursor.c diff --git a/externals/nitro/modules/c/nitf/source/TREPrivateData.c b/modules/c/nitf/source/TREPrivateData.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TREPrivateData.c rename to modules/c/nitf/source/TREPrivateData.c diff --git a/externals/nitro/modules/c/nitf/source/TREUtils.c b/modules/c/nitf/source/TREUtils.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TREUtils.c rename to modules/c/nitf/source/TREUtils.c diff --git a/externals/nitro/modules/c/nitf/source/TREs.c b/modules/c/nitf/source/TREs.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TREs.c rename to modules/c/nitf/source/TREs.c diff --git a/externals/nitro/modules/c/nitf/source/TestingTest.c b/modules/c/nitf/source/TestingTest.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TestingTest.c rename to modules/c/nitf/source/TestingTest.c diff --git a/externals/nitro/modules/c/nitf/source/TextSegment.c b/modules/c/nitf/source/TextSegment.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TextSegment.c rename to modules/c/nitf/source/TextSegment.c diff --git a/externals/nitro/modules/c/nitf/source/TextSubheader.c b/modules/c/nitf/source/TextSubheader.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/TextSubheader.c rename to modules/c/nitf/source/TextSubheader.c diff --git a/externals/nitro/modules/c/nitf/source/WriteHandler.c b/modules/c/nitf/source/WriteHandler.c similarity index 100% rename from externals/nitro/modules/c/nitf/source/WriteHandler.c rename to modules/c/nitf/source/WriteHandler.c diff --git a/externals/nitro/modules/c/nitf/source/wscript_build b/modules/c/nitf/source/wscript_build similarity index 100% rename from externals/nitro/modules/c/nitf/source/wscript_build rename to modules/c/nitf/source/wscript_build diff --git a/externals/nitro/modules/c/nitf/tests/test_1band_rw_line.c b/modules/c/nitf/tests/test_1band_rw_line.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_1band_rw_line.c rename to modules/c/nitf/tests/test_1band_rw_line.c diff --git a/externals/nitro/modules/c/nitf/tests/test_ImageIO.h b/modules/c/nitf/tests/test_ImageIO.h similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ImageIO.h rename to modules/c/nitf/tests/test_ImageIO.h diff --git a/externals/nitro/modules/c/nitf/tests/test_ImageIO_read_data.c b/modules/c/nitf/tests/test_ImageIO_read_data.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ImageIO_read_data.c rename to modules/c/nitf/tests/test_ImageIO_read_data.c diff --git a/externals/nitro/modules/c/nitf/tests/test_ImageIO_support.c b/modules/c/nitf/tests/test_ImageIO_support.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ImageIO_support.c rename to modules/c/nitf/tests/test_ImageIO_support.c diff --git a/externals/nitro/modules/c/nitf/tests/test_ImageIO_writePattern.c b/modules/c/nitf/tests/test_ImageIO_writePattern.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ImageIO_writePattern.c rename to modules/c/nitf/tests/test_ImageIO_writePattern.c diff --git a/externals/nitro/modules/c/nitf/tests/test_add_masks.c b/modules/c/nitf/tests/test_add_masks.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_add_masks.c rename to modules/c/nitf/tests/test_add_masks.c diff --git a/externals/nitro/modules/c/nitf/tests/test_atoi.c b/modules/c/nitf/tests/test_atoi.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_atoi.c rename to modules/c/nitf/tests/test_atoi.c diff --git a/externals/nitro/modules/c/nitf/tests/test_blank.ntf b/modules/c/nitf/tests/test_blank.ntf similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_blank.ntf rename to modules/c/nitf/tests/test_blank.ntf diff --git a/externals/nitro/modules/c/nitf/tests/test_clevel.c b/modules/c/nitf/tests/test_clevel.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_clevel.c rename to modules/c/nitf/tests/test_clevel.c diff --git a/externals/nitro/modules/c/nitf/tests/test_create_xmltre.c b/modules/c/nitf/tests/test_create_xmltre.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_create_xmltre.c rename to modules/c/nitf/tests/test_create_xmltre.c diff --git a/externals/nitro/modules/c/nitf/tests/test_debug_mem_1.c b/modules/c/nitf/tests/test_debug_mem_1.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_debug_mem_1.c rename to modules/c/nitf/tests/test_debug_mem_1.c diff --git a/externals/nitro/modules/c/nitf/tests/test_des.c b/modules/c/nitf/tests/test_des.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_des.c rename to modules/c/nitf/tests/test_des.c diff --git a/externals/nitro/modules/c/nitf/tests/test_des_create.c b/modules/c/nitf/tests/test_des_create.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_des_create.c rename to modules/c/nitf/tests/test_des_create.c diff --git a/externals/nitro/modules/c/nitf/tests/test_des_read.c b/modules/c/nitf/tests/test_des_read.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_des_read.c rename to modules/c/nitf/tests/test_des_read.c diff --git a/externals/nitro/modules/c/nitf/tests/test_des_read.ntf b/modules/c/nitf/tests/test_des_read.ntf similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_des_read.ntf rename to modules/c/nitf/tests/test_des_read.ntf diff --git a/externals/nitro/modules/c/nitf/tests/test_des_write.c b/modules/c/nitf/tests/test_des_write.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_des_write.c rename to modules/c/nitf/tests/test_des_write.c diff --git a/externals/nitro/modules/c/nitf/tests/test_dll_1.c b/modules/c/nitf/tests/test_dll_1.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_dll_1.c rename to modules/c/nitf/tests/test_dll_1.c diff --git a/externals/nitro/modules/c/nitf/tests/test_dll_1.cfg b/modules/c/nitf/tests/test_dll_1.cfg similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_dll_1.cfg rename to modules/c/nitf/tests/test_dll_1.cfg diff --git a/externals/nitro/modules/c/nitf/tests/test_dump_masks.c b/modules/c/nitf/tests/test_dump_masks.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_dump_masks.c rename to modules/c/nitf/tests/test_dump_masks.c diff --git a/externals/nitro/modules/c/nitf/tests/test_ext.txt b/modules/c/nitf/tests/test_ext.txt similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ext.txt rename to modules/c/nitf/tests/test_ext.txt diff --git a/externals/nitro/modules/c/nitf/tests/test_ext_iter.c b/modules/c/nitf/tests/test_ext_iter.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_ext_iter.c rename to modules/c/nitf/tests/test_ext_iter.c diff --git a/externals/nitro/modules/c/nitf/tests/test_fhdr_clone.c b/modules/c/nitf/tests/test_fhdr_clone.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_fhdr_clone.c rename to modules/c/nitf/tests/test_fhdr_clone.c diff --git a/externals/nitro/modules/c/nitf/tests/test_field_set.c b/modules/c/nitf/tests/test_field_set.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_field_set.c rename to modules/c/nitf/tests/test_field_set.c diff --git a/externals/nitro/modules/c/nitf/tests/test_fileIO.c b/modules/c/nitf/tests/test_fileIO.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_fileIO.c rename to modules/c/nitf/tests/test_fileIO.c diff --git a/externals/nitro/modules/c/nitf/tests/test_file_source.c b/modules/c/nitf/tests/test_file_source.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_file_source.c rename to modules/c/nitf/tests/test_file_source.c diff --git a/externals/nitro/modules/c/nitf/tests/test_find_field.c b/modules/c/nitf/tests/test_find_field.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_find_field.c rename to modules/c/nitf/tests/test_find_field.c diff --git a/externals/nitro/modules/c/nitf/tests/test_hash_table.key_val b/modules/c/nitf/tests/test_hash_table.key_val similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_hash_table.key_val rename to modules/c/nitf/tests/test_hash_table.key_val diff --git a/externals/nitro/modules/c/nitf/tests/test_hash_table.search_key b/modules/c/nitf/tests/test_hash_table.search_key similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_hash_table.search_key rename to modules/c/nitf/tests/test_hash_table.search_key diff --git a/externals/nitro/modules/c/nitf/tests/test_hash_table_1.c b/modules/c/nitf/tests/test_hash_table_1.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_hash_table_1.c rename to modules/c/nitf/tests/test_hash_table_1.c diff --git a/externals/nitro/modules/c/nitf/tests/test_hash_table_2.c b/modules/c/nitf/tests/test_hash_table_2.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_hash_table_2.c rename to modules/c/nitf/tests/test_hash_table_2.c diff --git a/externals/nitro/modules/c/nitf/tests/test_hash_table_clone.c b/modules/c/nitf/tests/test_hash_table_clone.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_hash_table_clone.c rename to modules/c/nitf/tests/test_hash_table_clone.c diff --git a/externals/nitro/modules/c/nitf/tests/test_image_loading.c b/modules/c/nitf/tests/test_image_loading.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_image_loading.c rename to modules/c/nitf/tests/test_image_loading.c diff --git a/externals/nitro/modules/c/nitf/tests/test_image_source.c b/modules/c/nitf/tests/test_image_source.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_image_source.c rename to modules/c/nitf/tests/test_image_source.c diff --git a/externals/nitro/modules/c/nitf/tests/test_imsub_clone.c b/modules/c/nitf/tests/test_imsub_clone.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_imsub_clone.c rename to modules/c/nitf/tests/test_imsub_clone.c diff --git a/externals/nitro/modules/c/nitf/tests/test_insert_raw_xmltre.c b/modules/c/nitf/tests/test_insert_raw_xmltre.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_insert_raw_xmltre.c rename to modules/c/nitf/tests/test_insert_raw_xmltre.c diff --git a/externals/nitro/modules/c/nitf/tests/test_it.h b/modules/c/nitf/tests/test_it.h similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_it.h rename to modules/c/nitf/tests/test_it.h diff --git a/externals/nitro/modules/c/nitf/tests/test_make_pattern.c b/modules/c/nitf/tests/test_make_pattern.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_make_pattern.c rename to modules/c/nitf/tests/test_make_pattern.c diff --git a/externals/nitro/modules/c/nitf/tests/test_plugin_reg_1.c b/modules/c/nitf/tests/test_plugin_reg_1.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_plugin_reg_1.c rename to modules/c/nitf/tests/test_plugin_reg_1.c diff --git a/externals/nitro/modules/c/nitf/tests/test_read_acftb.c b/modules/c/nitf/tests/test_read_acftb.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_read_acftb.c rename to modules/c/nitf/tests/test_read_acftb.c diff --git a/externals/nitro/modules/c/nitf/tests/test_record_clone.c b/modules/c/nitf/tests/test_record_clone.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_record_clone.c rename to modules/c/nitf/tests/test_record_clone.c diff --git a/externals/nitro/modules/c/nitf/tests/test_replace_field.c b/modules/c/nitf/tests/test_replace_field.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_replace_field.c rename to modules/c/nitf/tests/test_replace_field.c diff --git a/externals/nitro/modules/c/nitf/tests/test_text_read.c b/modules/c/nitf/tests/test_text_read.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_text_read.c rename to modules/c/nitf/tests/test_text_read.c diff --git a/externals/nitro/modules/c/nitf/tests/test_text_write.c b/modules/c/nitf/tests/test_text_write.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_text_write.c rename to modules/c/nitf/tests/test_text_write.c diff --git a/externals/nitro/modules/c/nitf/tests/test_writer_3.c b/modules/c/nitf/tests/test_writer_3.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_writer_3.c rename to modules/c/nitf/tests/test_writer_3.c diff --git a/externals/nitro/modules/c/nitf/tests/test_writer_s.c b/modules/c/nitf/tests/test_writer_s.c similarity index 100% rename from externals/nitro/modules/c/nitf/tests/test_writer_s.c rename to modules/c/nitf/tests/test_writer_s.c diff --git a/externals/nitro/modules/c/nitf/tests/verify/mem_sane.pl b/modules/c/nitf/tests/verify/mem_sane.pl similarity index 100% rename from externals/nitro/modules/c/nitf/tests/verify/mem_sane.pl rename to modules/c/nitf/tests/verify/mem_sane.pl diff --git a/externals/nitro/modules/c/nitf/unittests/Test.h b/modules/c/nitf/unittests/Test.h similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/Test.h rename to modules/c/nitf/unittests/Test.h diff --git a/externals/nitro/modules/c/nitf/unittests/nitro_image_.c_ b/modules/c/nitf/unittests/nitro_image_.c_ similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/nitro_image_.c_ rename to modules/c/nitf/unittests/nitro_image_.c_ diff --git a/externals/nitro/modules/c/nitf/unittests/test_create.c b/modules/c/nitf/unittests/test_create.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_create.c rename to modules/c/nitf/unittests/test_create.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_create_nitf.c b/modules/c/nitf/unittests/test_create_nitf.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_create_nitf.c rename to modules/c/nitf/unittests/test_create_nitf.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_field.c b/modules/c/nitf/unittests/test_field.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_field.c rename to modules/c/nitf/unittests/test_field.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_geo_utils.c b/modules/c/nitf/unittests/test_geo_utils.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_geo_utils.c rename to modules/c/nitf/unittests/test_geo_utils.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_image_io.c b/modules/c/nitf/unittests/test_image_io.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_image_io.c rename to modules/c/nitf/unittests/test_image_io.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_mem_source.c b/modules/c/nitf/unittests/test_mem_source.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_mem_source.c rename to modules/c/nitf/unittests/test_mem_source.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_moveTREs.c b/modules/c/nitf/unittests/test_moveTREs.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_moveTREs.c rename to modules/c/nitf/unittests/test_moveTREs.c diff --git a/externals/nitro/modules/c/nitf/unittests/test_zero_field.c b/modules/c/nitf/unittests/test_zero_field.c similarity index 100% rename from externals/nitro/modules/c/nitf/unittests/test_zero_field.c rename to modules/c/nitf/unittests/test_zero_field.c diff --git a/externals/nitro/modules/c/nitf/wscript b/modules/c/nitf/wscript similarity index 100% rename from externals/nitro/modules/c/nitf/wscript rename to modules/c/nitf/wscript diff --git a/externals/nitro/modules/c/nrt/CMakeLists.txt b/modules/c/nrt/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/c/nrt/CMakeLists.txt rename to modules/c/nrt/CMakeLists.txt diff --git a/externals/nitro/modules/c/nrt/COPYING b/modules/c/nrt/COPYING similarity index 100% rename from externals/nitro/modules/c/nrt/COPYING rename to modules/c/nrt/COPYING diff --git a/externals/nitro/modules/c/nrt/COPYING.LESSER b/modules/c/nrt/COPYING.LESSER similarity index 100% rename from externals/nitro/modules/c/nrt/COPYING.LESSER rename to modules/c/nrt/COPYING.LESSER diff --git a/externals/nitro/modules/c/nrt/Doxyfile b/modules/c/nrt/Doxyfile similarity index 100% rename from externals/nitro/modules/c/nrt/Doxyfile rename to modules/c/nrt/Doxyfile diff --git a/externals/nitro/modules/c/nrt/include/import/nrt.h b/modules/c/nrt/include/import/nrt.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/import/nrt.h rename to modules/c/nrt/include/import/nrt.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Config.h b/modules/c/nrt/include/nrt/Config.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Config.h rename to modules/c/nrt/include/nrt/Config.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/DLL.h b/modules/c/nrt/include/nrt/DLL.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/DLL.h rename to modules/c/nrt/include/nrt/DLL.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/DateTime.h b/modules/c/nrt/include/nrt/DateTime.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/DateTime.h rename to modules/c/nrt/include/nrt/DateTime.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Debug.h b/modules/c/nrt/include/nrt/Debug.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Debug.h rename to modules/c/nrt/include/nrt/Debug.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Defines.h b/modules/c/nrt/include/nrt/Defines.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Defines.h rename to modules/c/nrt/include/nrt/Defines.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Directory.h b/modules/c/nrt/include/nrt/Directory.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Directory.h rename to modules/c/nrt/include/nrt/Directory.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Error.h b/modules/c/nrt/include/nrt/Error.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Error.h rename to modules/c/nrt/include/nrt/Error.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Exports.h b/modules/c/nrt/include/nrt/Exports.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Exports.h rename to modules/c/nrt/include/nrt/Exports.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/HashTable.h b/modules/c/nrt/include/nrt/HashTable.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/HashTable.h rename to modules/c/nrt/include/nrt/HashTable.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/IOHandle.h b/modules/c/nrt/include/nrt/IOHandle.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/IOHandle.h rename to modules/c/nrt/include/nrt/IOHandle.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/IOInterface.h b/modules/c/nrt/include/nrt/IOInterface.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/IOInterface.h rename to modules/c/nrt/include/nrt/IOInterface.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/IntStack.h b/modules/c/nrt/include/nrt/IntStack.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/IntStack.h rename to modules/c/nrt/include/nrt/IntStack.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/List.h b/modules/c/nrt/include/nrt/List.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/List.h rename to modules/c/nrt/include/nrt/List.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Memory.h b/modules/c/nrt/include/nrt/Memory.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Memory.h rename to modules/c/nrt/include/nrt/Memory.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Pair.h b/modules/c/nrt/include/nrt/Pair.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Pair.h rename to modules/c/nrt/include/nrt/Pair.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Sync.h b/modules/c/nrt/include/nrt/Sync.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Sync.h rename to modules/c/nrt/include/nrt/Sync.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/System.h b/modules/c/nrt/include/nrt/System.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/System.h rename to modules/c/nrt/include/nrt/System.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Tree.h b/modules/c/nrt/include/nrt/Tree.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Tree.h rename to modules/c/nrt/include/nrt/Tree.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Types.h b/modules/c/nrt/include/nrt/Types.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Types.h rename to modules/c/nrt/include/nrt/Types.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Utils.h b/modules/c/nrt/include/nrt/Utils.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Utils.h rename to modules/c/nrt/include/nrt/Utils.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/Version.h b/modules/c/nrt/include/nrt/Version.h similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/Version.h rename to modules/c/nrt/include/nrt/Version.h diff --git a/externals/nitro/modules/c/nrt/include/nrt/nrt_config.h.cmake.in b/modules/c/nrt/include/nrt/nrt_config.h.cmake.in similarity index 100% rename from externals/nitro/modules/c/nrt/include/nrt/nrt_config.h.cmake.in rename to modules/c/nrt/include/nrt/nrt_config.h.cmake.in diff --git a/externals/nitro/modules/c/nrt/source/DLLUnix.c b/modules/c/nrt/source/DLLUnix.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/DLLUnix.c rename to modules/c/nrt/source/DLLUnix.c diff --git a/externals/nitro/modules/c/nrt/source/DLLWin32.c b/modules/c/nrt/source/DLLWin32.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/DLLWin32.c rename to modules/c/nrt/source/DLLWin32.c diff --git a/externals/nitro/modules/c/nrt/source/DateTime.c b/modules/c/nrt/source/DateTime.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/DateTime.c rename to modules/c/nrt/source/DateTime.c diff --git a/externals/nitro/modules/c/nrt/source/Debug.c b/modules/c/nrt/source/Debug.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/Debug.c rename to modules/c/nrt/source/Debug.c diff --git a/externals/nitro/modules/c/nrt/source/DirectoryUnix.c b/modules/c/nrt/source/DirectoryUnix.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/DirectoryUnix.c rename to modules/c/nrt/source/DirectoryUnix.c diff --git a/externals/nitro/modules/c/nrt/source/DirectoryWin32.c b/modules/c/nrt/source/DirectoryWin32.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/DirectoryWin32.c rename to modules/c/nrt/source/DirectoryWin32.c diff --git a/externals/nitro/modules/c/nrt/source/Error.c b/modules/c/nrt/source/Error.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/Error.c rename to modules/c/nrt/source/Error.c diff --git a/externals/nitro/modules/c/nrt/source/HashTable.c b/modules/c/nrt/source/HashTable.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/HashTable.c rename to modules/c/nrt/source/HashTable.c diff --git a/externals/nitro/modules/c/nrt/source/IOHandleUnix.c b/modules/c/nrt/source/IOHandleUnix.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/IOHandleUnix.c rename to modules/c/nrt/source/IOHandleUnix.c diff --git a/externals/nitro/modules/c/nrt/source/IOHandleWin32.c b/modules/c/nrt/source/IOHandleWin32.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/IOHandleWin32.c rename to modules/c/nrt/source/IOHandleWin32.c diff --git a/externals/nitro/modules/c/nrt/source/IOInterface.c b/modules/c/nrt/source/IOInterface.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/IOInterface.c rename to modules/c/nrt/source/IOInterface.c diff --git a/externals/nitro/modules/c/nrt/source/IntStack.c b/modules/c/nrt/source/IntStack.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/IntStack.c rename to modules/c/nrt/source/IntStack.c diff --git a/externals/nitro/modules/c/nrt/source/List.c b/modules/c/nrt/source/List.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/List.c rename to modules/c/nrt/source/List.c diff --git a/externals/nitro/modules/c/nrt/source/Pair.c b/modules/c/nrt/source/Pair.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/Pair.c rename to modules/c/nrt/source/Pair.c diff --git a/externals/nitro/modules/c/nrt/source/SyncIrix.c b/modules/c/nrt/source/SyncIrix.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/SyncIrix.c rename to modules/c/nrt/source/SyncIrix.c diff --git a/externals/nitro/modules/c/nrt/source/SyncUnix.c b/modules/c/nrt/source/SyncUnix.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/SyncUnix.c rename to modules/c/nrt/source/SyncUnix.c diff --git a/externals/nitro/modules/c/nrt/source/SyncWin32.c b/modules/c/nrt/source/SyncWin32.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/SyncWin32.c rename to modules/c/nrt/source/SyncWin32.c diff --git a/externals/nitro/modules/c/nrt/source/System.c b/modules/c/nrt/source/System.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/System.c rename to modules/c/nrt/source/System.c diff --git a/externals/nitro/modules/c/nrt/source/Tree.c b/modules/c/nrt/source/Tree.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/Tree.c rename to modules/c/nrt/source/Tree.c diff --git a/externals/nitro/modules/c/nrt/source/Utils.c b/modules/c/nrt/source/Utils.c similarity index 100% rename from externals/nitro/modules/c/nrt/source/Utils.c rename to modules/c/nrt/source/Utils.c diff --git a/externals/nitro/modules/c/nrt/source/wscript_build b/modules/c/nrt/source/wscript_build similarity index 100% rename from externals/nitro/modules/c/nrt/source/wscript_build rename to modules/c/nrt/source/wscript_build diff --git a/externals/nitro/modules/c/nrt/tests/verify/mem_sane.pl b/modules/c/nrt/tests/verify/mem_sane.pl similarity index 100% rename from externals/nitro/modules/c/nrt/tests/verify/mem_sane.pl rename to modules/c/nrt/tests/verify/mem_sane.pl diff --git a/externals/nitro/modules/c/nrt/unittests/Test.h b/modules/c/nrt/unittests/Test.h similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/Test.h rename to modules/c/nrt/unittests/Test.h diff --git a/externals/nitro/modules/c/nrt/unittests/test_buffer_adapter.c b/modules/c/nrt/unittests/test_buffer_adapter.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_buffer_adapter.c rename to modules/c/nrt/unittests/test_buffer_adapter.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_core_values.c b/modules/c/nrt/unittests/test_core_values.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_core_values.c rename to modules/c/nrt/unittests/test_core_values.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_list.c b/modules/c/nrt/unittests/test_list.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_list.c rename to modules/c/nrt/unittests/test_list.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_nrt_byte_swap.c b/modules/c/nrt/unittests/test_nrt_byte_swap.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_nrt_byte_swap.c rename to modules/c/nrt/unittests/test_nrt_byte_swap.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_nrt_datetime.c b/modules/c/nrt/unittests/test_nrt_datetime.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_nrt_datetime.c rename to modules/c/nrt/unittests/test_nrt_datetime.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_tree.c b/modules/c/nrt/unittests/test_tree.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_tree.c rename to modules/c/nrt/unittests/test_tree.c diff --git a/externals/nitro/modules/c/nrt/unittests/test_utils.c b/modules/c/nrt/unittests/test_utils.c similarity index 100% rename from externals/nitro/modules/c/nrt/unittests/test_utils.c rename to modules/c/nrt/unittests/test_utils.c diff --git a/externals/nitro/modules/c/nrt/wscript b/modules/c/nrt/wscript similarity index 100% rename from externals/nitro/modules/c/nrt/wscript rename to modules/c/nrt/wscript diff --git a/externals/nitro/modules/c/pch.c b/modules/c/pch.c similarity index 100% rename from externals/nitro/modules/c/pch.c rename to modules/c/pch.c diff --git a/externals/nitro/modules/c/pch.h b/modules/c/pch.h similarity index 100% rename from externals/nitro/modules/c/pch.h rename to modules/c/pch.h diff --git a/externals/nitro/modules/c/wscript b/modules/c/wscript similarity index 100% rename from externals/nitro/modules/c/wscript rename to modules/c/wscript diff --git a/externals/nitro/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/python/CMakeLists.txt rename to modules/python/CMakeLists.txt diff --git a/externals/nitro/modules/python/nitf/CMakeLists.txt b/modules/python/nitf/CMakeLists.txt similarity index 100% rename from externals/nitro/modules/python/nitf/CMakeLists.txt rename to modules/python/nitf/CMakeLists.txt diff --git a/externals/nitro/modules/python/nitf/samples/nitf_extract.py b/modules/python/nitf/samples/nitf_extract.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/nitf_extract.py rename to modules/python/nitf/samples/nitf_extract.py diff --git a/externals/nitro/modules/python/nitf/samples/nitf_print.py b/modules/python/nitf/samples/nitf_print.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/nitf_print.py rename to modules/python/nitf/samples/nitf_print.py diff --git a/externals/nitro/modules/python/nitf/samples/strip_invisible_segments.py b/modules/python/nitf/samples/strip_invisible_segments.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/strip_invisible_segments.py rename to modules/python/nitf/samples/strip_invisible_segments.py diff --git a/externals/nitro/modules/python/nitf/samples/test_image.py b/modules/python/nitf/samples/test_image.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/test_image.py rename to modules/python/nitf/samples/test_image.py diff --git a/externals/nitro/modules/python/nitf/samples/test_make_nitf.py b/modules/python/nitf/samples/test_make_nitf.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/test_make_nitf.py rename to modules/python/nitf/samples/test_make_nitf.py diff --git a/externals/nitro/modules/python/nitf/samples/test_reading_functions.py b/modules/python/nitf/samples/test_reading_functions.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/test_reading_functions.py rename to modules/python/nitf/samples/test_reading_functions.py diff --git a/externals/nitro/modules/python/nitf/samples/test_text_read.py b/modules/python/nitf/samples/test_text_read.py similarity index 100% rename from externals/nitro/modules/python/nitf/samples/test_text_read.py rename to modules/python/nitf/samples/test_text_read.py diff --git a/externals/nitro/modules/python/nitf/source/__init__.py b/modules/python/nitf/source/__init__.py similarity index 100% rename from externals/nitro/modules/python/nitf/source/__init__.py rename to modules/python/nitf/source/__init__.py diff --git a/externals/nitro/modules/python/nitf/source/generated/nitropy.py b/modules/python/nitf/source/generated/nitropy.py similarity index 100% rename from externals/nitro/modules/python/nitf/source/generated/nitropy.py rename to modules/python/nitf/source/generated/nitropy.py diff --git a/externals/nitro/modules/python/nitf/source/generated/nitropy_wrap.cxx b/modules/python/nitf/source/generated/nitropy_wrap.cxx similarity index 100% rename from externals/nitro/modules/python/nitf/source/generated/nitropy_wrap.cxx rename to modules/python/nitf/source/generated/nitropy_wrap.cxx diff --git a/externals/nitro/modules/python/nitf/source/nitro.i b/modules/python/nitf/source/nitro.i similarity index 100% rename from externals/nitro/modules/python/nitf/source/nitro.i rename to modules/python/nitf/source/nitro.i diff --git a/externals/nitro/modules/python/nitf/tests/runTests.py b/modules/python/nitf/tests/runTests.py similarity index 100% rename from externals/nitro/modules/python/nitf/tests/runTests.py rename to modules/python/nitf/tests/runTests.py diff --git a/externals/nitro/modules/python/nitf/unittests/test_import.py b/modules/python/nitf/unittests/test_import.py similarity index 100% rename from externals/nitro/modules/python/nitf/unittests/test_import.py rename to modules/python/nitf/unittests/test_import.py diff --git a/externals/nitro/modules/python/nitf/wscript b/modules/python/nitf/wscript similarity index 100% rename from externals/nitro/modules/python/nitf/wscript rename to modules/python/nitf/wscript diff --git a/externals/nitro/modules/python/wscript b/modules/python/wscript similarity index 100% rename from externals/nitro/modules/python/wscript rename to modules/python/wscript diff --git a/externals/nitro/modules/wscript b/modules/wscript similarity index 100% rename from externals/nitro/modules/wscript rename to modules/wscript diff --git a/externals/nitro/nitro.sln b/nitro.sln similarity index 100% rename from externals/nitro/nitro.sln rename to nitro.sln diff --git a/processFiles.py b/processFiles.py deleted file mode 100644 index 67d13fc9ab..0000000000 --- a/processFiles.py +++ /dev/null @@ -1,99 +0,0 @@ -import sys, os, re, subprocess -from os.path import isdir, join, split, exists - - -def cosmoSkyMed(filename): - path, fname = split(filename) - if re.match(r'CSK.*.MBI.tif', fname): - xmlName = join(path, fname.rsplit('MBI.tif')[0] + 'attribs.xml') - if exists(xmlName): - return (xmlName, filename) - return None - -def radarsat2(filename): - path, fname = split(filename) -# if re.match(r'RS2_.*', split(path)[1]) and re.match(r'imagery_.*.tif', fname): - if re.match(r'imagery_.*.tif', fname): - xmlName = join(path, 'product.xml') - if exists(xmlName): - return (xmlName, filename) - return None - -def terraSAR(filename): - path, fname = split(filename) - if re.match(r'IMAGEDATA', split(path)[1]) and re.match(r'IMAGE_.*.tif', fname): - parDir, xmlName = split(split(path)[0]) - xmlName = join(parDir, xmlName, '%s.xml' % xmlName) - if exists(xmlName): - return (xmlName, filename) - return None - - -if __name__ == '__main__': - from optparse import OptionParser - parser = OptionParser(usage="usage: %prog [options] [path(s)]") - parser.add_option("-d", "--dir", dest='outDir', metavar='DIR', - help="specify the output directory (default=cwd)") - parser.add_option("-x", "--xml", dest='xml', action='store_true', - help="Write An XML output") - parser.add_option("-n", "--nitf", dest='nitf', action='store_true', - help="Write A NITF output") - parser.add_option("-t", "--tiff", dest='tiff', action='store_true', - help="Write A TIFF output") - parser.add_option("-k", "--kml", dest='kml', action='store_true', - help="Write A KML output") - parser.add_option("-l", "--level", dest='level', metavar='LEVEL', default=None, - help="Level at which to log ") - parser.add_option("--limit", dest='limit', metavar='NUM', default=0, type='int', - help="Specify a limit on the number of images to process") - (options, args) = parser.parse_args() - - #default to cwd if none provided - outDir = options.outDir or os.getcwd() - if not exists(outDir): - os.makedirs(outDir) - - inputs = [] - paths = args[:] - while paths: - path = paths.pop(0) - if isdir(path): - paths.extend(map(lambda x: join(path, x), os.listdir(path))) - else: - f = cosmoSkyMed(path) - if not f: - f = radarsat2(path) - if not f: - f = terraSAR(path) - if f: - inputs.append(f) - - appName = os.path.abspath(join(split(__file__)[0], './install/bin/ScanSARConverter')) - if 'win32' in sys.platform: - appName += '.exe' - - cmd = [appName] - cmd.extend(['-d', outDir]) - if options.xml: - cmd.append('-x') - if options.nitf: - cmd.append('-n') - if options.tiff: - cmd.append('-t') - if options.kml: - cmd.append('-k') - if options.level: - cmd.extend(['-l', options.level]) - - def process(xml, image): - command = cmd[:] - command.append('%s,%s' % (xml, image)) - print command - p = subprocess.Popen(command).communicate() - - limit = (options.limit > 0 and min(options.limit, len(inputs)) or len(inputs)) - print 'Processing %d files' % limit - for i, (xml, image) in enumerate(inputs): - if i >= limit: - break - process(xml, image) diff --git a/externals/nitro/projects/nitroweb/config.py b/projects/nitroweb/config.py similarity index 100% rename from externals/nitro/projects/nitroweb/config.py rename to projects/nitroweb/config.py diff --git a/externals/nitro/projects/nitroweb/static/NITRO.png b/projects/nitroweb/static/NITRO.png similarity index 100% rename from externals/nitro/projects/nitroweb/static/NITRO.png rename to projects/nitroweb/static/NITRO.png diff --git a/externals/nitro/projects/nitroweb/static/header_bg.jpg b/projects/nitroweb/static/header_bg.jpg similarity index 100% rename from externals/nitro/projects/nitroweb/static/header_bg.jpg rename to projects/nitroweb/static/header_bg.jpg diff --git a/externals/nitro/projects/nitroweb/static/loading.gif b/projects/nitroweb/static/loading.gif similarity index 100% rename from externals/nitro/projects/nitroweb/static/loading.gif rename to projects/nitroweb/static/loading.gif diff --git a/externals/nitro/projects/nitroweb/static/nitroweb.css b/projects/nitroweb/static/nitroweb.css similarity index 100% rename from externals/nitro/projects/nitroweb/static/nitroweb.css rename to projects/nitroweb/static/nitroweb.css diff --git a/externals/nitro/projects/nitroweb/static/title_grad.gif b/projects/nitroweb/static/title_grad.gif similarity index 100% rename from externals/nitro/projects/nitroweb/static/title_grad.gif rename to projects/nitroweb/static/title_grad.gif diff --git a/externals/nitro/projects/nitroweb/templates/list.html b/projects/nitroweb/templates/list.html similarity index 100% rename from externals/nitro/projects/nitroweb/templates/list.html rename to projects/nitroweb/templates/list.html diff --git a/externals/nitro/projects/nitroweb/utils.py b/projects/nitroweb/utils.py similarity index 100% rename from externals/nitro/projects/nitroweb/utils.py rename to projects/nitroweb/utils.py diff --git a/externals/nitro/projects/nitroweb/webapp.py b/projects/nitroweb/webapp.py similarity index 100% rename from externals/nitro/projects/nitroweb/webapp.py rename to projects/nitroweb/webapp.py diff --git a/externals/nitro/projects/testing/regress.py b/projects/testing/regress.py similarity index 100% rename from externals/nitro/projects/testing/regress.py rename to projects/testing/regress.py diff --git a/remove_foss.csh b/remove_foss.csh deleted file mode 100755 index 2b562cc0d5..0000000000 --- a/remove_foss.csh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/tcsh - -rm -f externals/coda-oss/modules/drivers/xml/*/*tar* -rm -f projects/csm/external/*.zip diff --git a/scripts/cphd/cphd10_copyright.txt b/scripts/cphd/cphd10_copyright.txt deleted file mode 100644 index 7647c62700..0000000000 --- a/scripts/cphd/cphd10_copyright.txt +++ /dev/null @@ -1,21 +0,0 @@ -/* ========================================================================= - * This file is part of cphd-c++ - * ========================================================================= - * - * (C) Copyright 2004 - 2019, MDA Information Systems LLC - * - * cphd-c++ is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; If not, - * see . - * - */ diff --git a/scripts/cphd/source/copyright_update.py b/scripts/cphd/source/copyright_update.py deleted file mode 100644 index 08695bd16b..0000000000 --- a/scripts/cphd/source/copyright_update.py +++ /dev/null @@ -1,156 +0,0 @@ -#!/usr/bin/env python - -# -# ========================================================================= -# This file is part of cphd-python -# ========================================================================= -# -# (C) Copyright 2004 - 2019, MDA Information Systems LLC -# -# cphd-python is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; If not, -# see . -# - -# -# Script to edit copyright dates and company of files -# - -import sys -import os -import getopt -from datetime import datetime - - -# Returns list of copyright lines from file in path -def read_copyright_txt(path): - data = [] - if not os.path.isfile(path): - print("Failed due to invalid path: " + str(path)) - sys.exit(2) - with open(path, 'r') as f: - data = f.readlines() - - return data - - -# Assumes fixed format copyright -# Updates copyright text with year -def update_copyright_year(crTxt, year): - crTxt[4] = (" * (C) Copyright 2004 - " + str(year) - + ", MDA Information Systems LLC\n") - return crTxt - - -# Assumes fixed format copyright -# Updates copyright text with module name -def update_copyright_module(crTxt, module): - crTxt[1] = (" * This file is part of " + str(module) + "\n") - crTxt[6] = (" * " + str(module) - + " is free software; you can redistribute it " - + "and/or modify\n") - return crTxt - - -# Fix copyright in file -def fix_file(path, crTxt, year, module): - if not os.path.isfile(path): - print("Failed to write as path is not a file: " + str(path)) - return - # Read file to be written - with open(path, 'r') as f: - data = f.readlines() - - # If no copyright provided, assume copyright exists in file - if len(crTxt) == 0: - print("No Copyright text provided, assuming copyright exists in file") - crTxt = data[0:22] # Assumes copyright is 22 lines (for c++) - - # Update year with default current year, or custom in copyright - crTxt = update_copyright_year(crTxt, year) - - # If module specified, update module in copyright - if not len(module) == 0: - crTxt = update_copyright_module(crTxt, module) - - # If file is empty or there is no copyright in the file - if len(data) == 0 or not any(char in data[0] for char in ['/', '/*', '//']): - # Append new copyright text - data = crTxt + ["\n"] + data - # If old copyright already exists in file - else: - # Rewrite new copyright text - data[0:len(crTxt)] = crTxt - - # Write updated data to file - with open(path, 'w') as f: - f.writelines(data) - - print("Finished writing file: " + str(path)) - - -# Fix copyright in all files in directory -def fix_dir(path, crTxt, year, module): - if not os.path.isdir(path): - print("Failed due to invalid path: " + str(path)) - sys.exit(2) - - for file in os.listdir(path): - fix_file(os.path.join(path, file), crTxt, year, module) - - print("Finished writing directory: " + str(path)) - - -# Argument Parsing -if __name__ == '__main__': - fullCmdArguments = sys.argv - - argList = fullCmdArguments[1:] - - unixOptions = "hc:y:m:d:f:" - gnuOptions = ["help", "cr", "year", "module", "dir", "file"] - - # Default values - copyrightTxt = [] - year = str(datetime.now().year) - module = "" - try: - arguments, values = getopt.getopt(argList, unixOptions, gnuOptions) - except getopt.error as err: - print(str(err)) - sys.exit(2) - - for currentArgument, currentVal in arguments: - if currentArgument in ("-h", "--help"): - print("[-c, --cr] (Optional) File with new copyright text. \n" - + " If no copyright file is provided, script assumes\n" - + " copyright is first 22 lines of file (for C++) \n" - + "[-y, --year] (Optional) Update year in the copyright\n" - + "[-m, --module] (Optional) Update module name in the" - + " copyright\n" - + "[-f, --file] (Conditional) File to update copyright\n" - + "[-d, --dir] (Conditional) Directory to update copyright") - elif currentArgument in ("-c", "--cr"): - print("Reading new copyright text from file: " + str(currentVal)) - copyrightTxt = read_copyright_txt(currentVal) - elif currentArgument in ("-y", "--year"): - year = currentVal - elif currentArgument in ("-m", "--module"): - module = currentVal - elif currentArgument in ("-d", "--dir"): - fix_dir(currentVal, copyrightTxt, year, module) - elif currentArgument in ("-f", "--file"): - fix_file(currentVal, copyrightTxt, year, module) - else: - print("Incorrect arguments provided") - sys.exit(2) diff --git a/six.sln b/six.sln deleted file mode 100644 index e60ebc3568..0000000000 --- a/six.sln +++ /dev/null @@ -1,137 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nitf-c", "externals\nitro\modules\c\nitf-c.vcxproj", "{F06550AD-CFC7-40B8-8727-6C82C69A8982}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nitf-c++", "externals\nitro\modules\c++\nitf-c++.vcxproj", "{8F357A19-799E-4971-850E-3F28485C130B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "six", "six\modules\c++\six\six.vcxproj", "{62AAD4DD-35BA-41A0-8263-1F4DFD755689}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scene", "six\modules\c++\scene\scene.vcxproj", "{1CFCDE59-6410-4037-95EB-B37D31E10820}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cphd", "six\modules\c++\cphd\cphd.vcxproj", "{01BE4480-9620-4DED-B34F-D2E3AB4B7C8B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cphd03", "six\modules\c++\cphd03\cphd03.vcxproj", "{016EF417-E41C-404C-B3B5-34B6CDD94BB3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "six.sicd", "six\modules\c++\six.sicd\six.sicd.vcxproj", "{34AC2314-FBD1-42AD-AAF4-0CEBC6BF737E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "six.sidd", "six\modules\c++\six.sidd\six.sidd.vcxproj", "{DDC587C2-53BA-44A9-94E7-07BE52AF3D0B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "six.convert", "six\modules\c++\six.convert\six.convert.vcxproj", "{DB4ECC28-A862-4CF4-8A03-69B3CC0C4E8B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML_DATA_CONTENT", "externals\nitro\modules\c\nitf\XML_DATA_CONTENT.vcxproj", "{78849481-D356-4CC7-B182-31C21F857ED1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AD152C2-1F3D-4108-826C-79BA5011874F}" - ProjectSection(SolutionItems) = preProject - six\modules\c++\cpp_pch.h = six\modules\c++\cpp_pch.h - README.md = README.md - ReleaseNotes.md = ReleaseNotes.md - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "check_valid_six", "six\modules\c++\samples\check_valid_six.dir\check_valid_six.vcxproj", "{F0E2C8FF-57D4-4331-9BD2-76FF01CB54EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crop_sicd", "six\modules\c++\samples\crop_sicd.dir\crop_sicd.vcxproj", "{7DCFF6D2-72E8-43E8-8085-35C1721E8DAC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csm", "six\projects\csm\csm.vcxproj", "{6E767B43-D1A9-4B02-8D08-42037B7C9262}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{F6888896-E658-414C-90CD-1208FA31A22E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{F033066A-4172-4AC0-96AD-BF5090F713C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coda-oss", "externals\coda-oss\modules\c++\coda-oss.vcxproj", "{9997E895-5161-4DDF-8F3F-099894CB2F21}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github-workflows", ".github-workflows", "{DB2B94ED-952C-4794-A692-E6B64AA9EE5A}" - ProjectSection(SolutionItems) = preProject - .github\workflows\codeql.yml = .github\workflows\codeql.yml - .github\workflows\frequent_check.yml = .github\workflows\frequent_check.yml - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "8AMPI_PHSI", "six\modules\c++\samples\8AMPI_PHSI.dir\8AMPI_PHSI.dir.vcxproj", "{05C352A8-9F70-4006-B851-70A6904B58C1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F06550AD-CFC7-40B8-8727-6C82C69A8982}.Debug|x64.ActiveCfg = Debug|x64 - {F06550AD-CFC7-40B8-8727-6C82C69A8982}.Debug|x64.Build.0 = Debug|x64 - {F06550AD-CFC7-40B8-8727-6C82C69A8982}.Release|x64.ActiveCfg = Release|x64 - {F06550AD-CFC7-40B8-8727-6C82C69A8982}.Release|x64.Build.0 = Release|x64 - {8F357A19-799E-4971-850E-3F28485C130B}.Debug|x64.ActiveCfg = Debug|x64 - {8F357A19-799E-4971-850E-3F28485C130B}.Debug|x64.Build.0 = Debug|x64 - {8F357A19-799E-4971-850E-3F28485C130B}.Release|x64.ActiveCfg = Release|x64 - {8F357A19-799E-4971-850E-3F28485C130B}.Release|x64.Build.0 = Release|x64 - {62AAD4DD-35BA-41A0-8263-1F4DFD755689}.Debug|x64.ActiveCfg = Debug|x64 - {62AAD4DD-35BA-41A0-8263-1F4DFD755689}.Debug|x64.Build.0 = Debug|x64 - {62AAD4DD-35BA-41A0-8263-1F4DFD755689}.Release|x64.ActiveCfg = Release|x64 - {62AAD4DD-35BA-41A0-8263-1F4DFD755689}.Release|x64.Build.0 = Release|x64 - {1CFCDE59-6410-4037-95EB-B37D31E10820}.Debug|x64.ActiveCfg = Debug|x64 - {1CFCDE59-6410-4037-95EB-B37D31E10820}.Debug|x64.Build.0 = Debug|x64 - {1CFCDE59-6410-4037-95EB-B37D31E10820}.Release|x64.ActiveCfg = Release|x64 - {1CFCDE59-6410-4037-95EB-B37D31E10820}.Release|x64.Build.0 = Release|x64 - {01BE4480-9620-4DED-B34F-D2E3AB4B7C8B}.Debug|x64.ActiveCfg = Debug|x64 - {01BE4480-9620-4DED-B34F-D2E3AB4B7C8B}.Debug|x64.Build.0 = Debug|x64 - {01BE4480-9620-4DED-B34F-D2E3AB4B7C8B}.Release|x64.ActiveCfg = Release|x64 - {01BE4480-9620-4DED-B34F-D2E3AB4B7C8B}.Release|x64.Build.0 = Release|x64 - {016EF417-E41C-404C-B3B5-34B6CDD94BB3}.Debug|x64.ActiveCfg = Debug|x64 - {016EF417-E41C-404C-B3B5-34B6CDD94BB3}.Debug|x64.Build.0 = Debug|x64 - {016EF417-E41C-404C-B3B5-34B6CDD94BB3}.Release|x64.ActiveCfg = Release|x64 - {016EF417-E41C-404C-B3B5-34B6CDD94BB3}.Release|x64.Build.0 = Release|x64 - {34AC2314-FBD1-42AD-AAF4-0CEBC6BF737E}.Debug|x64.ActiveCfg = Debug|x64 - {34AC2314-FBD1-42AD-AAF4-0CEBC6BF737E}.Debug|x64.Build.0 = Debug|x64 - {34AC2314-FBD1-42AD-AAF4-0CEBC6BF737E}.Release|x64.ActiveCfg = Release|x64 - {34AC2314-FBD1-42AD-AAF4-0CEBC6BF737E}.Release|x64.Build.0 = Release|x64 - {DDC587C2-53BA-44A9-94E7-07BE52AF3D0B}.Debug|x64.ActiveCfg = Debug|x64 - {DDC587C2-53BA-44A9-94E7-07BE52AF3D0B}.Debug|x64.Build.0 = Debug|x64 - {DDC587C2-53BA-44A9-94E7-07BE52AF3D0B}.Release|x64.ActiveCfg = Release|x64 - {DDC587C2-53BA-44A9-94E7-07BE52AF3D0B}.Release|x64.Build.0 = Release|x64 - {DB4ECC28-A862-4CF4-8A03-69B3CC0C4E8B}.Debug|x64.ActiveCfg = Debug|x64 - {DB4ECC28-A862-4CF4-8A03-69B3CC0C4E8B}.Debug|x64.Build.0 = Debug|x64 - {DB4ECC28-A862-4CF4-8A03-69B3CC0C4E8B}.Release|x64.ActiveCfg = Release|x64 - {DB4ECC28-A862-4CF4-8A03-69B3CC0C4E8B}.Release|x64.Build.0 = Release|x64 - {78849481-D356-4CC7-B182-31C21F857ED1}.Debug|x64.ActiveCfg = Debug|x64 - {78849481-D356-4CC7-B182-31C21F857ED1}.Debug|x64.Build.0 = Debug|x64 - {78849481-D356-4CC7-B182-31C21F857ED1}.Release|x64.ActiveCfg = Release|x64 - {78849481-D356-4CC7-B182-31C21F857ED1}.Release|x64.Build.0 = Release|x64 - {F0E2C8FF-57D4-4331-9BD2-76FF01CB54EB}.Debug|x64.ActiveCfg = Debug|x64 - {F0E2C8FF-57D4-4331-9BD2-76FF01CB54EB}.Debug|x64.Build.0 = Debug|x64 - {F0E2C8FF-57D4-4331-9BD2-76FF01CB54EB}.Release|x64.ActiveCfg = Release|x64 - {F0E2C8FF-57D4-4331-9BD2-76FF01CB54EB}.Release|x64.Build.0 = Release|x64 - {7DCFF6D2-72E8-43E8-8085-35C1721E8DAC}.Debug|x64.ActiveCfg = Debug|x64 - {7DCFF6D2-72E8-43E8-8085-35C1721E8DAC}.Debug|x64.Build.0 = Debug|x64 - {7DCFF6D2-72E8-43E8-8085-35C1721E8DAC}.Release|x64.ActiveCfg = Release|x64 - {7DCFF6D2-72E8-43E8-8085-35C1721E8DAC}.Release|x64.Build.0 = Release|x64 - {6E767B43-D1A9-4B02-8D08-42037B7C9262}.Debug|x64.ActiveCfg = Debug|x64 - {6E767B43-D1A9-4B02-8D08-42037B7C9262}.Debug|x64.Build.0 = Debug|x64 - {6E767B43-D1A9-4B02-8D08-42037B7C9262}.Release|x64.ActiveCfg = Release|x64 - {6E767B43-D1A9-4B02-8D08-42037B7C9262}.Release|x64.Build.0 = Release|x64 - {F6888896-E658-414C-90CD-1208FA31A22E}.Debug|x64.ActiveCfg = Debug|x64 - {F6888896-E658-414C-90CD-1208FA31A22E}.Debug|x64.Build.0 = Debug|x64 - {F6888896-E658-414C-90CD-1208FA31A22E}.Release|x64.ActiveCfg = Release|x64 - {F6888896-E658-414C-90CD-1208FA31A22E}.Release|x64.Build.0 = Release|x64 - {9997E895-5161-4DDF-8F3F-099894CB2F21}.Debug|x64.ActiveCfg = Debug|x64 - {9997E895-5161-4DDF-8F3F-099894CB2F21}.Debug|x64.Build.0 = Debug|x64 - {9997E895-5161-4DDF-8F3F-099894CB2F21}.Release|x64.ActiveCfg = Release|x64 - {9997E895-5161-4DDF-8F3F-099894CB2F21}.Release|x64.Build.0 = Release|x64 - {05C352A8-9F70-4006-B851-70A6904B58C1}.Debug|x64.ActiveCfg = Debug|x64 - {05C352A8-9F70-4006-B851-70A6904B58C1}.Debug|x64.Build.0 = Debug|x64 - {05C352A8-9F70-4006-B851-70A6904B58C1}.Release|x64.ActiveCfg = Release|x64 - {05C352A8-9F70-4006-B851-70A6904B58C1}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F06550AD-CFC7-40B8-8727-6C82C69A8982} = {F033066A-4172-4AC0-96AD-BF5090F713C2} - {8F357A19-799E-4971-850E-3F28485C130B} = {F033066A-4172-4AC0-96AD-BF5090F713C2} - {78849481-D356-4CC7-B182-31C21F857ED1} = {F033066A-4172-4AC0-96AD-BF5090F713C2} - {9997E895-5161-4DDF-8F3F-099894CB2F21} = {F033066A-4172-4AC0-96AD-BF5090F713C2} - {DB2B94ED-952C-4794-A692-E6B64AA9EE5A} = {3AD152C2-1F3D-4108-826C-79BA5011874F} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E20E9FC7-D138-4517-8597-79C1FAC3E28D} - EndGlobalSection -EndGlobal diff --git a/six/CMakeLists.txt b/six/CMakeLists.txt deleted file mode 100644 index 8e2019b6e6..0000000000 --- a/six/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(modules) diff --git a/six/conf/setup.py.in b/six/conf/setup.py.in deleted file mode 100644 index efeb7b84a2..0000000000 --- a/six/conf/setup.py.in +++ /dev/null @@ -1,56 +0,0 @@ -from setuptools import setup, Distribution -import sys -import glob -import os -import platform -import sys - -installDir = '' -for child in os.listdir(os.getcwd()): - if os.path.isdir(child): - subdirs = os.listdir(child) - if 'tests' in subdirs: - installDir = child - -packages = '' -libdir = '@LIBDIR@' -if platform.system() == 'Windows': - packages = os.path.join(libdir, 'site-packages') -else: - versionedPython = 'python{0}.{1}'.format( - sys.version_info[0], sys.version_info[1]) - packages = os.path.join( - libdir, versionedPython, 'site-packages') - - -class BinaryDistribution(Distribution): - def is_pure(self): - return False - - def has_ext_modules(val): - return True - -codaPyds = glob.glob(os.path.join(packages, 'coda', '_*')) -codaPyds = [os.path.basename(pyd) for pyd in codaPyds] - -sixPyds = glob.glob(os.path.join(packages, 'pysix', '_*')) -sixPyds = [os.path.basename(pyd) for pyd in sixPyds] - -sixSchemas = glob.glob(os.path.join(packages, 'pysix', 'schemas', '*.xsd')) -sixSchemas = ['schemas/' + os.path.basename(pyd) for pyd in sixSchemas] - -setup(name = 'pysix', - version = '@SIX_VERSION@', - description = ('The Sensor Independent XML library (six), is a cross-' - 'platform C++ API for reading and writing NGA\'s complex and ' - 'derived sensor independent radar formats. Pysix is a Python ' - 'wrapper to allow easy reading and writing of the complex format.'), - install_requires = [ 'numpy' ], - package_dir = {'': packages}, - packages = ['pysix', 'coda'], - package_data = { - 'pysix': sixPyds + sixSchemas, - 'coda': codaPyds - }, - distclass = BinaryDistribution) - diff --git a/six/conf/wscript b/six/conf/wscript deleted file mode 100644 index 3bc8bf41da..0000000000 --- a/six/conf/wscript +++ /dev/null @@ -1,16 +0,0 @@ -import os - -options = distclean = lambda p: None - -def configure(conf): - if 'WHEEL_MAP' not in conf.env: - conf.env['WHEEL_MAP'] = {} - conf.env['WHEEL_MAP']['pysix'] = conf.getBuildDir() - -def build(bld): - bld(features='subst', - name='six_setup', - source='setup.py.in', - target='setup.py', - SIX_VERSION=bld.env['SIX_VERSION'], - LIBDIR=bld.env['install_libdir']) diff --git a/six/modules/CMakeLists.txt b/six/modules/CMakeLists.txt deleted file mode 100644 index ecbb92ba5f..0000000000 --- a/six/modules/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(TARGET_LANGUAGE c++) - -add_subdirectory(c++) -if (BUILD_PYTHON_MODULES) - add_subdirectory(python) -endif() diff --git a/six/modules/c++/CMakeLists.txt b/six/modules/c++/CMakeLists.txt deleted file mode 100644 index 6ec59c7bb3..0000000000 --- a/six/modules/c++/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# turn on maximum warnings -if (MSVC) - # By default, there is a /W3 on the command-line from somewhere (?); adding - # /Wn results in a compiler warning. - # - # https://github.com/microsoft/STL/wiki/Changelog#vs-2022-179-preview-1 - # > *Note*: `/Wall` is not intended for regular production use, as it contains a large number of - # > extremely noisy and low-value warnings. In general, the STL does not attempt to be `/Wall` clean. - string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # add_compile_options(/W4) - - add_compile_options(/wd4996) # '...': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. - add_compile_options(/wd4127) # conditional expression is constant - add_compile_options(/wd4244) # '...': conversion from '...' to '...', possible loss of data - add_compile_options(/wd4267) # '...': conversion from '...' to '...', possible loss of data - -elseif (UNIX) - #add_compile_options(-Wall -pedantic -Wextra) - add_compile_options(-Wall -Wextra) - - add_compile_options(-Wno-deprecated-copy) - add_compile_options(-Wno-class-memaccess) - add_compile_options(-Wno-sizeof-pointer-div) - add_compile_options(-Wno-unused-parameter) - add_compile_options(-Wno-ignored-qualifiers) -endif() - -add_subdirectory(scene) -add_subdirectory(six) -add_subdirectory(six.sicd) -add_subdirectory(six.sidd) -add_subdirectory(cphd) -add_subdirectory(cphd03) -add_subdirectory(six.convert) -add_subdirectory(samples) diff --git a/six/modules/c++/COPYING b/six/modules/c++/COPYING deleted file mode 100644 index 94a9ed024d..0000000000 --- a/six/modules/c++/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/six/modules/c++/COPYING.LESSER b/six/modules/c++/COPYING.LESSER deleted file mode 100644 index fc8a5de7ed..0000000000 --- a/six/modules/c++/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/six/modules/c++/Doxyfile b/six/modules/c++/Doxyfile deleted file mode 100644 index d8ec7598ff..0000000000 --- a/six/modules/c++/Doxyfile +++ /dev/null @@ -1,2460 +0,0 @@ -# Doxyfile 1.8.13 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "Sensor Independent XML" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = 2.2.7 - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = doc - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = YES - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = NO - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 0 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO, these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES, upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = externals/coda-oss/modules/c++ \ - externals/nitro/modules/c/cgm \ - externals/nitro/modules/c/j2k/include \ - externals/nitro/modules/c/jpeg \ - externals/nitro/modules/c/nitf \ - externals/nitro/modules/c/nrt \ - externals/nitro/modules/c++ \ - six/modules/c++ \ - six/projects/csm/include - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. - -FILE_PATTERNS = *.h* *.c* - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = tests \ - build \ - drivers - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = *tests/* \ - *.cpp - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = . - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = *.xcpp - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = YES - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = YES - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /