Skip to content

Commit

Permalink
Squashed 'externals/nitro/' changes from 496bfba718..c37e01d878
Browse files Browse the repository at this point in the history
c37e01d878 update sync_externals.csh to pull from coda-oss:main
fadf1b6a17 NITRO-2.11.1 (#511)
51c60eca3a coda-oss release 2022-11-04 (#510)
120e53b79f remove throw(something), deprecated in C++11 (#509)
14eb5ec057 build unittests in other projects (#507)
4e02c8011a latest from coda-oss (#506)
e12e6456b1 Adding tarfile member sanitization to extractall() (#505)
89c9549419 find known plugins (#503)
6f889c7609 run unittests in other projects (#502)
1457afec3c latest from coda-oss (#501)
0c6f81732d fix some incorrect field sizes in the CSEXRB TRE (#500)
370221354c latest from coda-oss (#499)
8cda7dc490 HDF5 source code
72447c8d68 YML for "main", not "master"
0192c297d0 NITRO-2.11.0 (#498)
c589cc8cab coda-oss 2022-08-30_cpp14 (#497)
b902f29e14 fix merge conflict
eba80ce74b Merge branch 'master'
61dafd4073 NITRO-2.10.12 (#496)
06993176d3 run unittests in SIX (#495)
f0d801e956 coda-oss release 2022-08-30 (#494)
8477e4729f Build jpeg decompression as a plugin. (#487)
c0abba06a6 Merge branch 'master'
59978233ae latest from coda-oss (#493)
54340035e6 Merge branch 'master'
53bbc66797 latest from coda-oss (#492)
179223ed84 Revert "-std=c11 for Linux?"
708179860f -std=c11 for Linux?
3a2ff608e9 main is now C++14, not C++20
489441b8c2 Update CMakeLists.txt
25f8fd7496 use GCC-10
9a9ac37a3c restore changes lost in merge
2425e99107 Merge branch 'master'
77a1114ebe NITRO 2.10.11 (#491)
b5fb2d2a96 another round of removing compiler warnings (#489)
2342edbef4 coda-oss 2022-08-02 (#490)
46ea890b26 Merge branch 'master'
7e1fe6a68c NITRO-2.10.10 (#486)
263a98cfcf coda-oss 2022-06-29 (#485)
67e80024d9 latest from coda-oss:main
54ba70a09e Merge branch 'master'
a3bb3a0327 nitf::byte is too much trouble right now (#484)
53a75a456a nitf::byte is more trouble than it's worth right now
a1fbcbde70 Merge branch 'master'
8d28243d2f update CodeQL to @v2 (#483)
7091d36a68 Update coda-oss (#482)
f40179473f return std::optional<> from "enum" utilities (#480)
3972dba9e7 update coda-oss (#479)
96a93af52e get CODA_OSS_API from "master"
7d7a31b9a2 Merge branch 'master'
3e38c39a0e latest from coda-oss (#477)
f27a3894e7 Do not add convenience test targets if given the libs_only flag.
eb6e6a0b99 latest from coda-oss:main
c325422924 Merge branch 'master'
ed0d1899bb NITRO-2.10.9 (#476)
f4eacccaf5 coda-oss release 2022-05-03 (#475)
4baedca729 turn off "warnings as errors" for now
1938e8b2a6 C++17 has non-const std::string::data()
8743b133e9 Squashed commit of the following:
a0cf3e90e2 Merge branch 'master'
758ac88e1d latest from feature/j2k branch (#474)
55eeba9fc4 build with C++20
4c93d6d3f7 Merge branch 'master'
b8a3f50762 tweaks to allow NITRO modules to be built as DLLs (#473)
af745281cf latest from feature/j2k branch (#471)
a7da2fc740 build more C code as C++ (#469)
5dbd0d9cdc latest from coda-oss (#468)
e9b611e239 build cleanly in VS2022
06ccfd6357 "warning as error" from master
b60d152db1 Merge branch 'master'
3e9387973c add lossy compression options (#464)
da6969ae0f latest from coda-oss (#465)
bd8ce81161 build most C with C++ (in Visual Studio ONLY) for better error-checking (#466)
dfeb3fe44d remove docs directory (#463)
2d52cf3f62 remove archive directory (#462)
d9f75ef701 Merge branch 'master'
5b11fe82cc copy j2k code from coda (#460)
f02c70645b merge develop/update_coda-oss
8907b9fc37 latest from coda-oss (#461)
1124c00f9e switch VS unit-test projects to VS-test (#459)
8968e3fc83 build in "main"
04b0ef4a0f delete files in "out" directory
c12cf79c86 Update NITFException.hpp
47adca89f1 latest from coda-oss:main
dcf564587b Merge branch 'master'
c6e7a6e409 Merge branch 'master' of github.com:mdaus/nitro
ed828aaf6b fix CodeQL diagnostic
762b2a2ce6 NITRO version 2.10.8 (#456)
466534fd85 begin work in C++ wrappers for 'j2k' C API.
3b72561d27 update to coda-oss release 2022-02-22 (#455)
c0c8d4f715 latest from coda-oss:main
d22382c6ec Squashed commit of the following:
ba35e18cd3 Merge branch 'master'
3f70bc3c36 latest from coda-oss (#454)
7746990ab8 latest from coda-oss:main
4e556856bd Squashed commit of the following:
b252f83343 Squashed commit of the following:
ba1586d870 Merge branch 'master'
8a8ea90b09 build with older C++ compilers, compile C as C++ (#453)
96ef07b45d Merge branch 'master'
9690f90760 update coda-oss (#451)
ee85f16b28 make our C and C++ versions "requried"
e5fb00b730 Merge branch 'master'
1d307d9aa8 latest from coda-oss (#449)
2bd17b15df Merge branch 'master'
6861d915a1 std include files got messed up
c71dc6d85c latest from coda-oss (#448)
ff26970ebb be sure variable is referenced
ba7cf4db12 Squashed commit of the following:
73f9426aa8 latest from coda-oss:main
c6e6efbfd2 Squashed commit of the following:
f8b70cfd6e Merge branch 'master'
db9f1d2a59 account for missing std::is_trivially_copyable<>  (#446)
7581fe17db latest from coda-oss (#445)
d991a04948 infrastructure to support "reflection" over C structs (#444)
e04238a27a Merge branch 'master'
edaf47f81f show how to use strongly-type TRE fields (#440)
8af36f6ed6 latest from coda-oss (#441)
fe89ce317e Re-add show_nitf++ app (#439)
2433d8c5ff Squashed commit of the following:
b3d0e39933 Merge branch 'master'
9ea44741d7 nitro 2.10.7 (#436)
458055cfcc coda-oss release 2021-12-13 (#435)
d4ad4b8a5c allow NITF_PLUGIN_PATH warning to be turned off (#434)
5bc7a39f0f Merge branch 'master'
7c96994a93 allow NITF_PLUGIN_PATH warning to be turned off (#432)
1b22d00a60 latest from coda-oss (#431)
a26f5b104e Squashed commit of the following:
6d375adea6 try again with Exception11
3528797b37 Revert "try again to use Exception11 as base class"
1940761aee try again to use Exception11 as base class
494c66e5b0 Squashed commit of the following:
aec5ac5887 Squashed commit of the following:
85115cf267 Squashed commit of the following:
10e82f2558 more work needed to use Exception11 as base class
832c081901 can't get rid of the Throwable overload
aafa78ac91 Squashed commit of the following:
4538afe979 Squashed commit of the following:
454389ab44 use Exception11 as base class
63c6c7aab0 Merge branch 'master'
489f10d70d tweaks from develop/jdsmith (#426)
c8b635070f Merge branch 'master'
9461c626c4 latest from coda-oss (#425)
13755f97e5 Squashed commit of the following:
f245996258 Squashed commit of the following:
3cd04a52e7 Squashed commit of the following:
37a3d372f4 Merge branch 'master'
2e8d7cfaec tweaks for new compiler on Windows (#424)
d3df338e9c Merge branch 'master'
e868e3747d build with VS2022 (#423)
88135e2c25 Squashed commit of the following:
8716407f15 Merge branch 'master'
65b4df02d5 Build with Visual Studio 2022 (#422)
75cd78027f C17 and C++20
cd35ce559a Squashed commit of the following:
7415708859 build with Visual Studio 2022
5aca0a352b use G++-10
051cba7c47 compile with C++20
4df16ef7c8 latest from coda-oss:main (C++20)
9cd6642fc3 build with C++20
09294e4a60 Squashed commit of the following:
b551da4717 C++17 changes from coda-oss
029245e921 Merge branch 'master'
64dc4e1181 -j 2 to prevent G++ crash
64ec3748cc try -j 2 for faster build
c4e122edfa include all of coda-oss (#421)
adc119fafe spaces, not tabs
d8de25452b trying to fix broken cmake build
9dbe61e7ee Merge branch 'master'
888ae92937 update version numbers before cutting a new release (#420)
28d95160e3 Tweaks from SIX's 8AMPI_PHSI branch (#418)
a0dd912a98 latest from coda-oss (#419)
b782ea5e1d remove #pragma once from CPP file
0bcd29d66b fix std/bit for C++20
dfba5e291c fix CodeQL failure (#417)
77b3b6e4a9 Merge branch 'master'
3c7653c3ef make building as a DLL easier (#416)
42f309c764 try C++20 for CMake
a184c56439 Merge branch 'master'
e17d918d42 read in 8-bit sample files using NITRO (#415)
b786739829 use strongly-typed enums rather than overload strings (#414)
ffd0cb43a1 build with C++17
d7fec1ee66 C++17
ba356b0aa8 Squashed commit of the following:
dfde872580 slam in "master"
479166465f Squashed commit of the following:
89559fa880 want C++17 in "main"
9c318935c2 Squashed commit of the following:
6fe42fbc8d Merge branch 'master'
30fc68feb2 latest from coda-oss (#413)
a4a1fc4f8b add a NITF version number (#412)
eef3c6ec8d update coda-oss (#411)
f5f1f8ce19 "nitro" changes from SIX (#410)
1a19b6b603 latest from coda-oss (#409)
0db498f1eb make the TRE API more robust (#406)
404a857ca5 Bugfix/engrda (#405)
1c73a52843 latest from coda-oss (#404)
9388d5cf21 latest from coda-oss (#402)
9578bcf83c Handle amp-phase data (#403)
81278527b6 remove compiler warnings that were clobbered by a previous merge (#401)
3ebffd8773 update coda-oss (#400)
c8186387fe tweak C++ API (#399)
dc000a516d latest from coda-oss (#398)
7af555d635 latest from coda-oss (#396)
cb37a8cffa remove compiler warnings (#395)
1b6cfe0991 latest from coda-oss (#388)
2229fbde02 forgot to add "units" to CMakeFiles.txt
e1a1bcefae latest from coda-oss (#387)
835da56f56 Bugfix/nitropy import error (#381)
508ee3e75c Fix invalid const cast error (#380)
fb293c1a29 build with something more recent than C89
10712fc6bb got copy-paste wrong
859010c9f4 back to C++17 for now
b211781259 Merge branch 'master' into main
7bb82996ca update coda-oss (#378)
98e6bcf5da remove more code-analysis diagnostics (#377)
eaf109eb4d C++17 fix from coda-oss
0d97539b97 almost build w/C++20
8eb0ef76b4 build with (almost) C++20
bea6db32f9 Merge branch 'master' into main
c3dc822059 update coda-oss (#376)
7acaf38edc match "master"
172714e337 #pragma warning is _MSC_VER only
ffd5aa858a Revert "do a Debug build on Windows"
5d84be10ca do a Debug build on Windows
b1683ea11f Merge branch 'main' of github.com:mdaus/nitro into main
9b928303a2 build cleanly in VS2019
2940ec1595 refresh from "master"
62e3bdce70 Merge branch 'master' into main
e6cfbfab8e make parts of the C++ API a bit more python-like (#375)
9194eb0d3b Merge branch 'master' into main
75caf49ec4 remove compiler warnings/code-analysis diagnostics (#374)
a6cec9dfeb update coda-oss (#373)
f4b80a31dc reduce compiler warnings (#371)
ac4141ddce Merge branch 'master' into main
4ddaf23d84 remove compiler warnings (#370)
2a57741c24 update coda-oss (#369)
d36c562f3b Merge branch 'master' into main
d3fab714a0 update coda-oss (#368)
8806960a8d tweak to force rebuild of "master" on github
9aee934ea3 remove compiler warnings (#367)
7be6c13b1b set an "invalid" string result for invalid inputs (#366)
d4f244ee83 remove more compiler warnings/code-analysis diagnostics (#364)
d011795409 latest from coda-oss (#363)
a16f72b0c0 make it easier to build nitf-c++ as a shared library (#362)
35c5f4ade0 reduce compiler and code-analysis warnings (#361)
273c39e863 latest from coda-oss  (#360)
b6b38054d6 Merge branch 'master' into main
298536f401 remove unused coda-oss modules to fix? broken build (#351)
edb9317dbc Update README.md
152b1d66a3 Java and MATLAB bindings are no longer built.
2748224ba4 unittests work from clean build in VS2019 (#347)
296750e1d3 Delete codacy-analysis.yml
2121cda37e Delete checkmarx-analysis.yml
393b6cd559 Create codacy-analysis.yml
a01fa4d6fa Create checkmarx-analysis.yml
effd340063 fix more CodeQL diagnostics (#346)
e145375a7b Merge branch 'master' into main
a2b3a12d91 Fixed bug in python interface, and enabled a few features in the c library to be accessible from python (#342)
1e171cdfc2 remove code-analysis diagnostics (#345)
fa40480016 Merge branch 'master' into main
c68cd17ddf latest from coda-oss (#344)
4ff3782d4f latest from coda-oss:main
f455459a3c Merge branch 'develop/update_coda-oss' into main
daf11b09b5 latest from coda-oss
b2ee4c0cc4 Merge branch 'master' into develop/update_coda-oss
6dc6856db7 Merge branch 'master' into main
bb0634924d update coda-oss (#343)
d46965774f latest from coda-oss
875900215d Merge branch 'master' into develop/update_coda-oss
c83d97832e #pragma-away warning from <complex>
b7d7a7fa80 this branch builds with C++17
f015b5c98f Merge branch 'master' into main
fa20f42ee8 use new coda-oss header for easier access to "std::" (#341)
eae673f69e tweak std:: handling from coda-oss
fe3129e92d std:: changes from coda-oss
c8b1b7f9bb and still more coda-oss updates
e4b655cea0 another update from coda-oss
32e14a957c latest from coda-oss
d641748827 Merge branch 'master' into develop/update_coda-oss
c80e163eec Build w/older compilers; remove some code-analysis diagnostics (#340)
dfad79efcf Delete ossar-analysis.yml
007ced759d archive matlab and java (#293)
0e201d8b0d Create ossar-analysis.yml
c4eae8e4ca Create codeql-analysis.yml
ea1946b4a4 Delete codeql-analysis.yml
e40a0b3f61 add ENABLE_ASAN to turn on address sanitizer (#336)
2d9a968f2b fixed a bug where an uninitialized pointer caused a crash (#335)
7c5dbed7fb `nullptr_t` should be `std::nullptr_t`
e38e05bb29 Merge branch 'master' into develop/update_coda-oss
612a558893 remove version number from externals/coda-oss (#333)
4eb99576b3 missing "build" and "cmake" directories
f99a8e343c rename "coda-oss"
c36f316d06 restore coda-oss
3a94197a81 do rename (again)
2b1c237d26 Merge branch 'master' into develop/update_coda-oss
c146397652 nitro doesn't need "re" module (#332)
03ff84a4bb missing "build" and "cmake" files
25eb456089 get red of the version number (for now); we've been w/o for a very long time
14517c04f8 put a version on externals/coda-oss (#331)
d6b87a2520 add back .cmake files
0827cf5a5a Merge branch 'develop/update_coda-oss' of github.com:mdaus/nitro into develop/update_coda-oss
f62735eb54 add back build directory
daaf0f7e00 Merge branch 'master' into develop/update_coda-oss
8705bbb638 C iterator routines can be "const" (#330)
f26f1f916a externals/coda-oss is now a junction or sym-link
4a3200ade5 rename "coda-oss" to include version #
ee54fff151 Merge branch 'master' into develop/update_coda-oss
f77a3820d1 Merge branch 'master' into main
62ec491193 update coda-oss (#326)
4d4c9b252b latest from coda-oss
c937262798 Merge branch 'master' into develop/update_coda-oss
b7f04aecb0 fix broken unit-test; implement missing overload (#325)
bebfbab20d Merge branch 'master' into develop/update_coda-oss
f810f8f6e5 Fix length calculation for moveTRE and unmergeTREs (#324)
ad0f83a6f2 Null init Image writers (#323)
e77ddad8f4 CMake: Build c libraries, in Windows, as DLLs (#321)
bdf37cc458 Merge branch 'master' into main
7a8dcf2965 update coda-oss (#322)
d100a7d288 latest from coda-oss to build with older compilers
82afef8fde Merge branch 'master' into develop/update_coda-oss
333b821899 Merge branch 'master' into main
f0a45b36d2 latest from coda-oss (#320)
d277cb432d revert c99 changes (#319)
f1a76a95a0 latest from coda-oss
a8692278d5 Merge branch 'master' into develop/update_coda-oss
ae5aefa1a1 Merge branch 'master' into main
1b6ae6adb8 hide template<template> from C++11 (#318)
e510f3d7b2 Merge branch 'master' into main
ee89c7d341 Bug fixes, new TREs, and cython interface (#314)
af91356565 Merge branch 'master' into main
f925204cbc revert c99 changes (#317)
2f0d13feda Merge branch 'master' into main
dc2bfc2f63 Merge branch 'master' into develop/update_coda-oss
1615ce17b0 update coda-oss (#316)
ad01361402 don't need .github in "externals"
31e42bbae3 latest from coda-oss
1cd6b1e220 Merge branch 'master' into develop/update_coda-oss
bbe02cde3b build with C++17 in this branch
905abbff81 Merge branch 'master' into main
0fbebcbdc8 update coda-oss (#313)
88cd12dc43 latest from coda-oss
6bc7a365c1 Merge branch 'develop/update_coda-oss' of github.com:mdaus/nitro into develop/update_coda-oss
8b51116b8d Merge branch 'master' into develop/update_coda-oss
91cb407988 std::filesystem::path doesn't implicitly convert to std::string
287ad87bd4 latest from coda-oss
9ab0959a64 try harder to compile with C++17
6fb07547fb can't figure out how to install later version of g++
37738180f0 trying to install a more recent version of g++
5c7bafa595 spaces instead of tabs
cce8fa221f install the latest g++
5e8545d652 Merge branch 'master' into main
2801416281 fix errors/warnings from code-diagnostic tools (#312)
f419dc5380 Update .gitignore for CMakeSettings.json
bc379d3f73 build with C++17 in this branch
9bee8c38f8 Merge branch 'master' into main
2d73f0ee15 latest from coda-oss (#311)
d01c825407 latest from coda-oss
1a3e65cb39 Merge branch 'master' into develop/update_coda-oss
4a51148c71 build "main" with C++17
979b11ff30 Merge branch 'master' into main
0d6988eb1c latest from coda-oss (#310)
a7849538b6 don't need to change coda-oss drop
33cf616e4b gsl::span -> std::span
b229bead94 latest from coda-oss:master
29a88056ba get coda-oss #includes via coda-oss.hpp to augment "std" (#309)
5e60c0959b Merge branch 'master' into main
5be4b7e639 "noexcept" is a breaking change ... be more careful with it. (#307)
63ee18c41c Merge branch 'master' into main
92b19f9c52 remove nitf::byte (#306)
657d5a1daa Merge branch 'master' into main
9045a98d9a slam in "master" (again) to minimize merge conflicts
08dd5441f7 restore modules/java and modules/mex and remove archive to minimize changes to "main" and "master"
554f1c1b52 manaully update "main" with changes from "master" to minimize merge conflicts
c1ef1e9337 bring over non-breaking changes from "main" (#303)
cf559b1097 update coda oss (#301)
1d91f312ef latest from coda-oss (#300)
e6448b1dd4 tweaks so that six builds with nitro updates (#299)
d27779eb76 std::byte -> nitf::byte until we can use C++17 everywhere (#298)
413fadf3a8 Update .gitignore
5c6a2ef684 update coda-oss (#297)
8bb4d248c5 build with Visual Studio 2019 (#295)
698841c866 get unittest changes from main (#294)
9a29ce5f9d latest from coda-oss:master (#291)
67d3256908 reduce compiler warnings and the like from C code (#292)
38295eda48 latest from develop/jdsmith (#290)
adc0e73fe6 latest from develop/jdsmith (#289)
918ec51823 update coda-oss (#288)
9946049f4e use GSL from coda-oss (#287)
75ccefa3d2 latest from coda-oss (#286)
b6f883fc18 latest from coda-oss (#285)
16289ae3be update coda-oss (#284)
bce3916acb one more change from develop/jdsmith (#283)
09eaf7266a latest from develop/jdsmith (#282)
ff3ca9dcbf update coda-oss (#281)
2b0e059f30 increase use of range "for" (#280)
8bde696806 latest updates from develop/jdsmith (#279)
b545a6101b latest from develop/jdsmith (#276)
aa13b3a620 Feature/update coda oss (#277)
bed0e25265 int64_t instead of sys::Off_T (#275)
07f8d9a626 latest from develop/jdsmith (#274)
8a97faadd8 ... still one more "common" use-case.
e5b270a9ab ... and one more overload for a common use-case
30b249258b restore SegmentMemorySource() overload to avoid breaking too much existing code
a7b77e86ae more use of std::byte (#273)
f1b67ffaf1 use std::shared_ptr and filesystem instead of mem:: and sys:: routines (#272)
da88a43a63 move real GSL code to a place where it will be copied by existing scripts (#270)
19ed66f861 Feature/remove compiler warnings (#271)
d8f1f8c5c6 build show_nitf++ in VS2019 (#269)
57f5aa5c8f remove compiler warnings (#268)
c6407b8b6e remove compiler warnings (#267)
09c2016361 GetEnvironmentVariable() and getenv() aren't quite the same
be7174a709 use top-level WAF install directory rather than externals (#266)
f07461b69f remove compiler warnings (#265)
00a0a7819d remove dozens of compiler warnings (#264)
3d65ba13d0 tweak wrap-around results (#263)
c7601b7423 fix wrap-around values (#262)
f5c5574120 remove compiler warnings (#261)
a1022e1c88 latest coda-oss from "main" (#260)
35254eb831 get unittest working with WAF on Linux
7e371459c2 fix unit-test for WAF on Windows
70755443ac latest from coda-oss (#259)
d141017fb0 remove coda-oss modules not needed by nitro (#258)
3ea4b8313d latest from coda-oss (#257)
a9bf63fb90 update coda-oss (#256)
c5f2e5e0ee latest from develop/jdsmith (#254)
e1ff1e8aac move "mex" and "java" to an archive folder (#255)
045718acb8 Feature/update coda oss (#251)
0be5b5cc41 update coda oss (#250)
8ffdeaf110 wlhen building SWIG code, C-style enums are used
fe4f6c9ef7 need C-style enum with SWIG & build XML_DATA_CONTENT (#249)
621bba7dfb latest from coda-oss to remove code-analysis warnings (#248)
bacedbba30 fix Field to be compatible with existing code
572531c186 build new TREs w/CMake (#246)
c126d5d39d Add four TREs defined in MIL-PRF-89034. (#192)
5c8c30b1c9 build new TREs w/CMake (#246)
4efc97eaff Add four TREs defined in MIL-PRF-89034. (#192)
839b51f63d remove compiler warnings (#245)
42e35f33e2 tre: add MATESA support (#244)
e139210399 tre: add MATESA support (#244)
fa37bc21ca Create codeql-analysis.yml
7e9b93f713 Create codeql-analysis.yml
505dea66a7 update coda-oss (#242)
79bc5e06f0 java: update to supported version (#241)
eaafd58a12 java: update to supported version (#241)
d5df4ba252 display TREs from other parts of the file (#239)
aa8d3aa57f Fix bug with myResidual calculation (#204)
59afdc92e0 Fix bug with myResidual calculation (#204)
2fb1833ddd build with Visual Studio 2019 (#237)
8251e9a23e get some more "const" correctness changes (#238)
4b3ac6de38 make many more "getters" const (#235)
f99755a37e write out the TREs to XML (#234)
b8c0cdf7a0 make a bunch of "getters" const (#233)
ee745cb88e Revert "Merge branch 'master' into main"
e490193780 Merge branch 'master' into main
050fcbc961 Fix assorted compiler warnings (#232)
6d77fb41eb Fix assorted compiler warnings (#232)
11704d375d update "documentation" (#231)
cad5c02f94 update "documentation" (#231)
ae2c21c9bb use our own str*_s() routines  (#230)
bb814d464a can't figure out how to use C11 (for strcpy_s()) on all platforms (#226)
0fb1607196 Revert "merge "main" into "master" (#224)"
1c7aa66534 Merge branch 'main' of github.com:mdaus/nitro into main
0faaa0165a merge "main" into "master" (#224)
3031b6507f trying to fix compiler crash
9183dcb88d grab a few tweaks from develop/jdsmith (#223)
cc9956b2da develop/master -> main (#221)
1437badef4 Develop/main (#220)
c13a2e0d29 Merge branch 'master' into main
5579e74e81 update "master" with several changes from "develop" (#219)
5988bb5297 don't build "macos"
ed0063048a coda-oss doesn't build "macos" so we don't either (#218)
903686414c update "main" with latest "develop" changes (#208)
c1ddf4cde8 Feature/update coda oss (#217)
d77737f5da update coda-oss (#216)
c5c602dd0c update coda-oss (#214)
033220f924 latest coda-oss from master-C++17 (#212)
7caacb9415 copy some documentation from the old website; work-in-progress (#211)
0f0d054046 Feature/remove compiler warnings (#210)
9a609577c0 Feature/use standard c types (#209)
c83348fd36 ignore more build artifacts
3bb1ef02e2 Merge pull request #205 from mdaus/bugfix/Security-vulnerability-in-nitro
9757b5af58 fix a bunch of code-analysis warnings about using NULL pointers (mostly …
6b72b7c37e fix a bunch of code-analysis warnings about using NULL pointers (mostly benign as pointer won't actually be NULL)
22716b796a be sure local variables are initialized for all code paths
c0b7b38b9e no .vcxproj in this branch
40d66294ab fix some build warnings
362b5492e2 build with VS2019 CMake support

git-subtree-dir: externals/nitro
git-subtree-split: c37e01d87808ed498972d789809b98b3bb75b223
  • Loading branch information
Dan Smith authored and Dan Smith committed Nov 9, 2022
1 parent 84c56dc commit d7124c9
Show file tree
Hide file tree
Showing 2,213 changed files with 593,877 additions and 75,428 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 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
72 changes: 72 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# 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:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '19 23 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'cpp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
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.

# 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#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ 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@v2
10 changes: 5 additions & 5 deletions .github/workflows/frequent_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ jobs:
- name: make
run: |
cd build
cmake --build . --config Release -j
cmake --build . --config Release -j 2
cmake --build . --config Release --target install
- name: test
run: |
cd build
ctest -C Release
ctest -C Release --output-on-failure
build-linux:
name: Linux
Expand All @@ -48,9 +47,10 @@ jobs:
- name: make
run: |
cd build
cmake --build . -j
# using the default number of threads (-j) causes G++ to crash
cmake --build . -j 2
cmake --build . --target install
- name: test
run: |
cd build
ctest
ctest --output-on-failure
62 changes: 62 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Build, unittest

on:
push:
branches: main
pull_request:
branches: main


jobs:
build-windows:
name: Windows
runs-on: [windows-latest]

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
- name: configure
run: |
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
- name: make
run: |
cd build
cmake --build . --config Release -j
cmake --build . --config Release --target install
- name: test
run: |
cd build
ctest -C Release
build-linux:
name: Linux
runs-on: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
- name: configure
run: |
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
- name: make
run: |
cd build
# using the default number of threads (-j) causes G++ to crash
cmake --build . -j 2
cmake --build . --target install
- name: test
run: |
cd build
ctest
74 changes: 0 additions & 74 deletions .github/workflows/master.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,50 @@
.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
22 changes: 22 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
image: continuumio/anaconda3:5.0.1

before_script:
- python -V # Print out python version for debugging
- echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
- sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
- apt-get -o Acquire::Check-Valid-Until=false update
- apt-get install -y build-essential
- pip install cython Deprecated==1.1

run:
tags:
- docker
script:
- python waf configure --prefix=install --enable-debugging
- python waf build
- python waf install
- (cd modules/python/cython; python setup.py bdist_wheel)
artifacts:
paths:
- install/*
- modules/python/cython/dist/*.whl
Loading

0 comments on commit d7124c9

Please sign in to comment.