From 08e4e06364559ec2838036a4ec5905a69e970f58 Mon Sep 17 00:00:00 2001 From: "J. Daniel Smith" Date: Tue, 19 Dec 2023 14:02:31 -0500 Subject: [PATCH] latest from CODA-OSS and NITRO (#728) * latest from CODA-OSS and NITRO * Squashed 'externals/coda-oss/' changes from e87c32b4d..03f1a3bdf 03f1a3bdf release 2023-10-23 (#747) 4dd7b2fbd Merge branch 'main' of github.com:mdaus/coda-oss 9428f12a0 add extensions for .log and known Windows/Linux binaries (#746) c3fd20a88 added some OLD Visual Studio extensions d00db384a everything is text except for known binaries c3813bb29 eol=lf is the default 4a2f472c7 add extensions for .log and known Windows/Linux binaries (#746) 18f2c051f more FmtX() -> str::Format() changes (#745) 959532681 reduce use of FmtX macro (#743) fffac7fc4 Fix memory leaks in "cli" (#741) 95ff879ba make it easier to turn on AVX2/AVX512F (#740) a950c848b enable AVX2 and AVX512F CMake builds (#739) 369737085 use std::ssize() to reduce casts (#738) 8ae7dabac std::size() and std::ssize() (#737) 8db480be5 enable ASAN for GitHub builds (#736) c92a55d7c build in SIX 333b91024 Squashed commit of the following: ac8c312db Only allow va_args formatting under controlled circumstances (#735) 589aacfd7 str::to_native() for when conversion to std::string really is needed 743feb41e try hard not to lose string encoding (#734) 1854a9b46 hide use of str::cast() inside `details` namespace (#733) fbe0c85f9 compile-time getSIMDInstructionSet() (#732) ee2c46358 more consistent naming for routines to convert between encodings (#731) 00e2dd928 another FmtX() overload 165a799c5 more FmtX() overloads (#729) 8dee6f7a6 revert toString() changes (#728) bf7ae4a71 use overloads rather than varargs for std::format() (#727) 22e050207 utility routines to reduce duplicated code (#726) a5ea60647 remove str::EncodedStringView (#725) 168cbae01 reduce differences between 'main' and 'cpp17' (#724) 5b892bf5f release 2023-08-18 (#723) 0b1327d1e restore mem::AutoPtr; too much of a hassle moving it to numpyutils :-( (#722) 7691adb56 normalize line endings (#721) b7d50efdd update to HDF5 1.14.2 (#720) fcc96ec69 Update .gitattributes (#719) bb82a94c9 xerces-c 3.2.4 (#718) ef4ad7cf3 Update to e2fsprogs 1.47.0 (#717) b4ca18a11 fix compiler warning about order of operations a5df5b823 update to HighFive 2.7.1 (#716) 4109ee5d2 `mem::AutoPtr` is only for Python bindings (#715) 00d843f87 remove hdf5.lite (#714) 443dd3825 Reduce compiler warnings, speed up builds (#713) d60861821 get optional working with partial C++17 (#712) d5bd0d804 "warning STL4036: is removed in C++20." c19ece7f9 Don't interfere with a partial C++20 implementation (#711) 065e86ddc operator==() for QName (#710) 1c16380ce remove zint* typedefs; don't want to encourage use of types::Complex (#709) 6dd247991 our optional<> is now closer to C++17 (#708) 87ac61739 strict checking on `std::complex` is too much of a hassle for now 034d52c86 overloads to byte-swap type::Complex are too much trouble (#707) 42d449c33 sys::byteSwap overloads for types::Complex (#705) 4092fd8e7 remove work-around for NITRO bug (#704) e2472acfc build in NITRO and SIX (#703) 32ccf9105 Use same build paths as Visual Studio (#701) 366ac9f43 Another round of removing compiler warnings (#702) a7f8ef260 Fix compile warnings from building CODA (#700) f70b4202f account for coda-oss.vcxproj being in other SLNs af3faebfc Remove more compiler/code-analysis warnings (#699) 82be2a6db unittests should work w/o install (#698) dbb90a06d add msbuild for coda-oss.sln (#697) 5a417140a reduce compiler warnings (#696) 288619dfa all modules now part of coda-oss.vcxproj (#695) c2fc5fc66 add more projects to coda-oss-lite.vcxproj (#694) ceb86c186 support $(PlatformToolset) as a "special" environment variable (#693) d78a8595a OS::getSIMDInstructionSet() utility (#692) 2d2df467d fix `python3 waf dumplib` 54033e70e Merge branch 'main' into feature/complex_short 3c63f9f65 std::numbers from C++20 (#691) 892dd0e00 ComplexInteger and ComplexReal to better match existing naming conventions (#690) b3872181e match coda-oss naming conventions (#688) 704d6867f beef-up our complex type (#687) 47c1c1cd6 check is_absolute() for URLs (#686) c042373e1 be sure our Path::isAbolute() matches std::filesystem::path::absolute() (#684) ad10286bc volatile is about "special" memory, not threading (#685) f4d42005f fix build error in NITRO ff11a5557 keep using std::complex for now (#682) c88b9c053 types::complex (#681) d1244a080 don't need our own make_unique in C++14 (#680) aeec0131c assert()s for mem::CopyablePtr (#679) 72b0ebd60 add types::complex_short (#678) 932130a58 patch to build other projects c00c1f203 coda-oss release 2023-06-06 (#677) ef54bbcd5 remove more compiler warnings (#676) dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674) 90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675) eb9960772 stronger type-checking for byteSwap() (#673) ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672) b1de8c0e5 std::byte should be a unique type (#671) c05bf9a02 allow enums to be byte-swapped too 1f9fd88d6 remove spurious 47684c45b byteSwap now uses byte buffers (#670) cbc659db2 add swapBytes() utility from SIX (#669) 891481b64 simplify byte-swapping (#668) 540ae763e more byteSwap() tweaks 0774c03c4 threaded byteSwap() (#667) d156370d3 swapping a single-byte value makes no sense c120e3255 be sure parameter is used to avoid compiler warning e85ec9331 --output-on-failure for CTest (#666) e80376197 turn off "there is no warning number" warning c5f0a5d15 A C-string may not be NULL-terminated (#665) 0c5eb29ae use platform-specific routines for byteSwap() (#664) 0b7d581fa remove transform_async() (#663) f6489b6be Merge branch 'main' into feature/xml.lite_tweaks 836c426a2 use function-pointers so that isConsoleOutput is only checked once 56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks 69cc0e506 use the more rigorous create_and_check_datatype() 9efb87558 Merge branch 'main' into feature/hdf5 4d2f2f417 more HighFive unittests (#662) 14191a844 HighFive::create_datatype() goes from C++ to HighFive 98583473f utility routines to read string attributes 1fa75ce81 use the C API to read a string attribute 71e7b69f5 still can't figure out how to read a string attribute :-( e96f37a69 test reading the file attributes a25244519 getAttribute() unittest 8f12a3000 getDataType() unittest 857ff0af3 HighFive utility routines (#661) 1d687db57 writeDataSet() utility overload 106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-( 2641b60b2 Merge branch 'main' into feature/hdf5 35c19e7e8 change actions to @v3 (#660) 212bbd3a3 works on local machine, but not build server ... ? 7125118b0 dump of 1D vector doesn't work :-( c704db435 sigh ... WAF build still failing :-( 01aae4616 does dump() of a 1D vector work? 76a53c813 comment-out H5 writing :-( 0f0e19aff test_highfive_dump() cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF 6584a264a does test_highfive_create() work? cde6147ce tweak HighFive wrappers (#659) 316566854 Revert "trying HighFive "write" unittests again" a9ec24ca4 trying HighFive "write" unittests again 585ad49a5 tweak names of utility routines 4c91a4d97 make it easier to read a std::vector and std::vecotr 0217ffa26 readDataSet() now works for 1D data 95e8973f2 trying to get hdf5::lite::load() working 4d294611d "const" correctness 5e6305c3f fix load_complex() 4a134dc5f start work on utility routines to read complex data from HDF5 9d76a7f41 Merge branch 'main' into feature/hdf5 8f9667a24 whitepsace ebd3fc99e Merge branch 'main' into feature/hdf5 40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure 935aa3459 be sure the dataset has real data 114b9bf33 update release notes bd9c0b26c tweak HighFive utility routines acda1ef57 turn off diagnostics around expected failures 22a748840 readDataSet() utility routine for HighFive bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC 6142f5b33 use HighFive routines to write a HDF5 file 5bbf1abaf Use HiveFive routines to get info about the file 84fbc8378 duplicate unittests with H5Easy f1f054c03 Merge branch 'main' into feature/hdf5 9b63ca470 fix directory names f6f826689 fix directory names 7aeb82c33 Merge branch 'main' into feature/hdf5 d028baaeb hook up HighFive header-only library (#653) 3083b0a31 Revert "HighFive 2.6.2" 246985a7f Revert ""build" HighFive HDF5 library" a8b75a586 Revert "turn off HighFive Boost support" ec68d5f83 Revert "Add HighFive unittests" f1f85b9e7 Revert "get test_high_five_base more-or-less compiling" 5ea634ee1 Revert "more work on getting HighFive unittests to build" ecc45433c more work on getting HighFive unittests to build bb194788a get test_high_five_base more-or-less compiling d42bde000 Add HighFive unittests ddc86bb32 turn off HighFive Boost support b255122d4 "build" HighFive HDF5 library 396cc3ef2 HighFive 2.6.2 5e5f9d9c0 Merge branch 'main' into feature/hdf5 ee938b4a5 changes from SIX bb764df90 Merge branch 'main' into feature/xml.lite_tweaks de2a24380 make derived classes 'final' if possible 14e19bcd2 Change xml lite function to virtual (#645) 8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks 18ad90645 hdf5Write unittest 3462e1179 createFile() and writeFile() overloads ecee81d53 fix typos 197eecfa6 sketch-out hdf5::lite::writeFile() bd2311795 use SpanRC for writeFile(), not yet implemented ea9af7510 simple SpanRC to hold a 2D-size and pointer 027c19ee8 createFile() unittest 1f9d07ecb hook up createFile() 8c7e4473f start hooking up HDF5 writing 146e0bea3 Merge branch 'main' into feature/hdf5 88ca9fcb7 Merge branch 'main' into feature/hdf5 42b604b46 Squashed commit of the following: 10ee602c2 Merge branch 'main' into feature/hdf5 67aa42b69 restore changes from "main" 8bbfcbfbf unittests can be simplified to match fewer "view" classes 126bb802e Merge branch 'main' into feature/hdf5 3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<> 24c2b489c Squashed commit of the following: 2703c119d Squashed commit of the following: 9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<> 51bc931dc Merge branch 'main' into feature/hdf5 a84f25816 Squashed commit of the following: c4d2ed696 add missing #include guards, fix type in existing #include guard d541525a0 use a single ComplexViewConstIterator for all views 86e6a459f CODA_OSS_disable_warning causes GCC errors :-( 5d4b9c2cb only need an custom iterator for ComplexSpansView d9f0fb128 hook up iterators b9329e4db initial pass at a ComplexViewConstIterator 635238873 remove compiler warning about unused "constexpr" variables b39f6096f use the casing from H5 to make copy/pasting code slightly easier 0887b13eb Merge branch 'main' into feature/hdf5 bd07df1ca Consistent casing for Dataset, Datatype, Dataspace 7acd30ee2 tweak hdf5.lite dependencies 38ab914df Jupyter notebook for creating H5 files 95a040e0b _small.h5 is now (correctly) FLOAT32 107e7c487 make a simple values() member function to avoid template magic e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch 738333688 readDatasetT() now throws for the wrong buffer type 6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 310f8fd3d can't get template magic right for copy_axis() 86b306d59 stepping through copy ctors in the debugger is annoying f243e92d6 trying to make wrong type of buffer fail 2b10d9652 read in new sample file a28e59d8c help the compiler with type deduction 49bf5e9bc nested_complex_float_data_small.h5 e029325fc utility routines to "deconstruct" and array of std::complex dede3bd39 Merge branch 'main' into feature/hdf5 904b1ef5e tweak class names, make_() and copy() utility routines 8237b9efb make it harder to pass the wrong types to ComplexViews 4d9aeda2c ComplexArrayView and ComplexParallelView utility classes f5e367dfa test std::span> a4a2844f2 read in the nested "i" and "r" data 115615265 sample file has subgroups 8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5 9f4232a1d update sample H5 file 8c55db73a walk through HDF5 sub-groups 7775ed9c4 Update 123_barfoo_catdog_cx.h5 677975d7c Matlab code to create sample H5 file a0e7dfe07 Update test_hdf5info.cpp 0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message 86a677321 skeleton for more sample data 85f79b099 Merge branch 'main' into feature/hdf5 18088e942 Merge branch 'main' into feature/hdf5 3a1d17692 Merge branch 'main' into feature/hdf5 1755c69d7 Merge branch 'main' into feature/hdf5 9ad015432 No more "11" suffix on exception names c20d96251 Squashed commit of the following: c88cee999 other values to be filled-in bca4a4ecd incorporation NamedObject from HDF5 docs 61fa68f72 groupInfo() 460e7d766 datasetInfo() 14eb9b764 start filling in DatasetInfo afe5f1c3a start to fill in DatasetInfo 77a968c72 start filling in GroupInfo d81bcdfd9 openGroup() to open groups (loc) a0cd29469 comment-out "dataset" unittest for now 86e006024 begin filling in FileInfo 366dda6ab a return_type_of utility is needed to deduce the return type e21928263 explicitly pass return type to template 4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions b3b5ebde7 use new exception utility routines ea1c03ef0 put exception handling/conversion in a utility routine 819a99d39 utility routine for exception handling 6f34eea97 put utilities in a separate file for easier reuse fcbde4f24 break utility routines into smaller pieces for easier reuse 52358ea8a WIN32 no longer automatically defined? 5a4286472 Revert "build HDF5 with C89" 680e599e9 build HDF5 with C89 a87a07121 Merge branch 'main' into feature/hdf5 8447c1a90 Revert "sym-links instead of copying files" db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks fb60b5696 Merge branch 'main' into feature/hdf5 5110a5cc8 Comments about _u and _q 1a937d32c Merge branch 'main' into feature/xml.lite_tweaks fa06f04d7 get ready for hdf5.lite enhancdements b040c7c43 sym-links instead of copying files aa431bb47 use _u for xml::lite::Uri 3d0c6d58c fix case-sensitive #include filename 93dcd0e52 operator() for getElementByName() 75a93af85 more operator[] overloads to make attribute management easier 4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks ffdd9beb0 simplify attribute creation 9bf5414f5 simplify attribute creation 82d7a4e95 SWIG gets confused about namespaces 7a61d0741 fix bug on Element ctor uncovered by unittest fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings a325b7053 operator+=() overload for addChild daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks b887d2b47 provide overloads for Element& rather than creating new "reference" types 1fa6bba38 rename test_xmleasy.cpp 7c8c9e0f1 += overload 850da6f63 overload for std::string 4547fc5a7 use UIT-8 strings for characterData 4723462a3 convenient addChild() overloads e48720753 copy over ElementReference from xml.easy a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks 6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)" f7466a6d7 Revert "simple routines for single element" a5490230d Revert "make some operators simplier ways of calling functions" c9a25630a Revert "get document creation working" 8af8710b0 Revert "free functions instead of member functions" 16c3847cb Revert "ElementReference distinct from Element" 7d68e156f Revert "ElementMutableReference" 00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks a42969c1f ElementMutableReference a20ae9355 ElementReference distinct from Element 14eeeea0b free functions instead of member functions 4aae014b3 get document creation working 883569269 make some operators simplier ways of calling functions 053bd1212 simple routines for single element 8bf701a2e check-in of new xml.easy (to move code between computers) 41f959051 unittests for creating XML documents from scratch 9752d50ae Merge branch 'main' into feature/xml.lite_tweaks 1531d5709 by default, don't validate strings passed to Uri() 46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks 39b547d32 remove more vestiges of Expat and LibXML ec8274d52 remove LibXML and Expat as they're no longer used/supported. 20eeefeef Merge branch 'master' into feature/xml.lite_tweaks 95074b9b1 update for newer Intel compiler 7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks 57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks 4b67561c3 remove validate() overload that nobody is using fa15f1e5d Squashed commit of the following: 1484a9090 test the new validate() API 470da70fb hookup StringStreamT routines 2cddf2504 begin hooking up validate() overloads 1b5d910f3 overload validate() for UTF-8 and Windows-1252 03309b8c9 Squashed commit of the following: b72c6c5bf older compiler doesn't like our make_unique af8f00307 validate UTF-8 XML on Linux 211188613 unit-test for LEGACY XML validation 3c1169d2b Squashed commit of the following: 3afff19ca std::filesystem::path for FileInputStreamOS 908d452f8 WIP: validate all of our sample XML files 00f9bb16b validate against a XML schema 243d8c356 Merge branch 'master' into feature/xml.lite_tweaks 2815d707d fix to work with SWIG bindings. :-( 460862132 trying (again) to remove vestiages of old code e3c83a858 Revert "new code should use UTF-8" 811207c92 new code should use UTF-8 0ffd835f9 Squashed commit of the following: 1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks c1d806aff Merge branch 'master' into feature/xml.lite_tweaks 850d3c811 str::strip() that can be easier to use than str::trim() 580ba9c8c explicitly =delete move 2b39831a8 Squashed commit of the following: 39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks 9adf86cba force calling new UTF-8 write() routines ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks 8a34583fa overload to take schemaPaths as filesystem::path 8671b442f parse XML embedded in a binary file ec4a902f1 updates from xerces.lite 80dc4d963 updates from xerces.lite 549766d6c Attributes::contains() no longer catches an exception 8a645ceac need "sys/" when building in other environments 36af08269 super-simple URI validation 78ef28a3e SWIG bindings are a PITA! :-( e9cba8491 SWIG needs help with Uri 8a8d8dc07 another routines used by pre-build SWIG bindings 818e1ec5d pre-build SWIG bindings use getElementByTagName() member function 067cac5d8 old compiler gets confused on unadorned QName ba92c0ae7 more use of Uri and QName 446c7d17a use QName in new code d6f8b0c83 more direct use of QName 90fff1c73 use xml::lite::QName instead of tuple 646cbb5ed more direct use of QName and Uri ba589ea3b make QName more robust bab0ee8b5 createElement() -> addNewElement() e3a145747 grab changes from six-library 32285e95c Merge branch 'master' into feature/xml.lite_tweaks 9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks a12bbc32c make it easier to create new Elements with a value fc9967f98 make it easy for callers to addChild() keep a reference to the Element 4627766b7 be sure test_xmlparser works in "externals" of other projects bf2276396 "private" is part of the name-mangling fad92bcc8 making sure copy-ctor is implemented f90fdcead consolidate common XML test code 9fc53f2d5 use str:: utility for casting 6da6f794b still trying to find the right macro for SWIG 0c1b86c56 still trying to fix SWIG fdc6fc9bd trying to fix SWIG build error 7835e8c27 SWIG needs copy-ctor 585695942 disable copy/assignment for Element, it's probably almost always wrong 391fed613 fix double-delete caused by copying 61790fe69 retry parsing XML with Windows-1252 if first parse() fails 63cffac59 change string_encoding to match coda-oss style of PascalCase 010479bbe read an XML file we know is wrongly encoded as Windows-1252 9a0505062 more references instead of pointers 2d44b6951 Reading Windows-1252 w/o "encoding" fails 63dc7b076 read Windows-1252 too c9434c9cb test as UIT-8 too f310ccf0c get reading from UTF-8 XML working on Windows 1fa39c2be get testReadUtf8XmlFile working on Linux 1a83cd815 sys::Path is too much trouble right now ed60aa22c unit-test to read XML from a file a9336db7c Squashed commit of the following: 0825beb0d Merge branch 'master' into feature/xml.lite_tweaks c618489be Merge branch 'master' into feature/xml.lite_tweaks e8e4b8fe1 determine string_encoding based on platform 1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding 961bef66b Merge branch 'master' into feature/xml.lite_tweaks e9798a5cb fix static_assert() 6f7772874 Merge branch 'master' into feature/xml.lite_tweaks b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks 1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features. 53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks 60cf8ae80 "" doesn't work with decltype() in older C++ 97e72477a reduce getValue() overloads by making "key" a template argument 5e6373e55 reduce code duplication f9e7cfeee provide castValue instead of getValue(T&) cbd0bd8f2 castValue throws instead of returning a bool like getValue(T&) 87c7514fc Merge branch 'master' into feature/xml.lite_tweaks 10cc61223 make getElement*() consistent for zero or >1 results f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks 1765efc62 allow clients to specify toType() and toString() for getValue() and setValue() df8b746e1 allow clients to specify their own toType/toString routines 66702726a Merge branch 'master' into feature/xml.lite_tweaks 6956311f1 Merge branch 'master' into feature/xml.lite_tweaks d505f3593 Merge branch 'master' into feature/xml.lite_tweaks fbd106115 catch a BadCastException and return false from getValue() 3a78377b5 use a template to reduce duplicated code 0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks a848aa3a2 get & set the characer data as a type f3ee1ee12 utility routines to set an attribute value 595227683 templates to get an attribute value convert to a specific type 06639227b miised a change in last commit 1aa458ef8 add getValue() overloads that return true/false rather than throwing faa6d3075 added getElementByTagName() overloads as that's a very common use-case git-subtree-dir: externals/coda-oss git-subtree-split: 03f1a3bdfa72d1baf84625fb6bcf9467e5792ace * Squashed 'externals/nitro/' changes from c8ecbe9ae..0357b1432 0357b1432 NITRO-2.11.5 (#589) a0ad6f943 CODA-OSS 2023-10-23 (#588) 1b631e578 latest from CODA-OSS (#587) 574bfe2b6 FmtX() -> str::Format() (#586) edfa0f7ce latest from CODA-OSS (#585) b26e15318 latest from CODA-OSS (#583) 0db9bdb29 fix ASAN diagnostics (#582) e418beceb Merge commit '6144b2cfb436a5696bab62c81651b47edf07aa8c' 6144b2cfb Squashed 'externals/coda-oss/' changes from 8dee6f7a68..c92a55d7c7 32d9c4fe4 latest from CODA-OSS 49f6338d2 latest from CODA-OSS (#581) 72cd86cbf latest from CODA-OSS (#580) e4920a743 FmtX() -> str::Format() 81ea6f178 Squashed 'externals/coda-oss/' changes from e87c32b4de..8dee6f7a68 e488297c3 Merge commit '81ea6f1789863f26f06dc447f7784383dc7cb595' 72209535d toString() changes from CODA-OSS (#579) fc1f59799 latest from CODA-OSS (#578) 02e8f80c6 latest from CODA-OSS (#577) e7ea728ec reduce differences between cpp17 and main branches (#576) 547d0aa9f NITRO-2.11.4 (#575) fe309c4ba Merge branch 'main' of github.com:mdaus/nitro 10efa9990 latest from CODA-OSS (#574) d08f1c0a1 CRLF db5d3d484 latest from CODA-OSS 98c755048 CRLF aa1482543 CRLF bfdbe69a4 Latest from CODA-OSS (#573) 9e4ce0b58 latest from CODA-OSS (#572) 227a8a8f4 trust coda-oss for right -std flags 13869687e latest from CODA-OSS (#571) 5724d8c18 latest from CODA-OSS (#570) fb794f0fe latest from CODA-OSS (#569) 7a6132ba0 update files changes in cpp17 branch (#568) de91d4977 Fix bug creating NITFException (#567) 225273436 fix YAML for 'main' 5d1c83d11 single project for unittests (#566) 102a019db latest from CODA-OSS (known broken build) (#565) b4ae2d429 match YAML from coda-oss 176bcaf6d build NITRO.SLN using msbuild (#562) 85e9043b8 latest from CODA-OSS (#561) 49ec50325 use new "PlatformToolkit" special environment variable (#560) 6c06e3711 latest from CODA-OSS (#559) cee9feb42 latest from CODA-OSS (#558) 3f01809fa latest from coda-oss (#557) 471fb3fc1 Update test_j2k_loading++.cpp b12caf2fc latest from CODA-OSS (#556) 0cd432624 use sys::make_span (#555) 05dae18a3 patch to build other projects 8f974e995 NITRO-2.11.3 (#554) 870aa6afd update to coda-oss 2023-06-05 (#553) 2fd7a0bfa latest from coda-oss (#552) 0eecce004 invoke() utility to reduce code duplication (#550) 59fb02fe9 latest from coda-oss (#551) 9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549) 089ba0b5b latest from coda-oss 3b52f0025 latest from coda-oss (#547) 90c6263e2 latest from coda-oss (#544) 90d513ac5 latest from coda-oss (#543) git-subtree-dir: externals/nitro git-subtree-split: 0357b143293bc7b1ce5d5d941f1a5e6564b319a9 * latest from CODA-OSS * Squashed 'externals/coda-oss/' changes from 03f1a3bdf..3ae8f6afb 3ae8f6afb Merge pull request #751 from mdaus/bugfix/hdf5-missing-files-main 3ec510861 Add missing files 1693eac7e Update build_unittest.yml git-subtree-dir: externals/coda-oss git-subtree-split: 3ae8f6afb3816bbb2ca9a72fbbd9ef78644eb5bf * latest from CODA-OSS and NITRO * Squashed 'externals/coda-oss/' changes from 3ae8f6afb..92f8b88c7 92f8b88c7 std::ostringstream overloads 8cb27de27 reduce use of .c_str() and .str() (#752) git-subtree-dir: externals/coda-oss git-subtree-split: 92f8b88c758504e8d0d2a3dfb389b71d49b557e5 * Squashed 'externals/nitro/' changes from 0357b1432..0342b596a 0342b596a latest from CODA-OSS (#592) 0084f9bf7 reduce use of .str() (#591) 253f57b2b latest from CODA-OSS (#590) d6bc1d83a disable code-analysis to fix Github builds 981e75116 Update main.yml 907bf91cd Update frequent_check.yml git-subtree-dir: externals/nitro git-subtree-split: 0342b596aa3b4e1809086e4676d3e49fd8ccd261 * latest from CODA-OSS and NITRO * Squashed 'externals/coda-oss/' changes from 92f8b88c7..aea8e7b1e aea8e7b1e reduce use of str::toString() (#754) 8062154a4 HighFive 2,8,0 (#753) git-subtree-dir: externals/coda-oss git-subtree-split: aea8e7b1ee845039a62fafca207a4df6e8df15e0 * Squashed 'externals/nitro/' changes from 0342b596a..a37046807 a37046807 latest from CODA-OSS (#596) 205bf8e36 infrastructure for "preloading" TREs (#593) git-subtree-dir: externals/nitro git-subtree-split: a37046807ab36de5268e1247e901e704e3f1e81e * return type needs to be explicit for subsequent specialization * latest from CODA-OSS and NITRO * Squashed 'externals/coda-oss/' changes from aea8e7b1e..5eae4c1f6 5eae4c1f6 turn of /Wall for MSVC (#755) 47d4b6b73 return type needs to be explicit (not `auto`) for subsequent specialization git-subtree-dir: externals/coda-oss git-subtree-split: 5eae4c1f6e3d2ba64bb78cd63ec0b525f7f6d98a * Squashed 'externals/nitro/' changes from a37046807..de4686af0 de4686af0 improve TRE unitesting (#599) a4d0a5130 remove /Wall from MSVC (#598) b97c4a867 disable pre-loaded TREs (#597) 1075b4ecd be sure the string is properly padded for the field type git-subtree-dir: externals/nitro git-subtree-split: de4686af03ed60f9881d4fbea876a84d6f202d46 * Squashed 'externals/coda-oss/' changes from 5eae4c1f6..df4e0fc1f df4e0fc1f changes to build SIX DLLs (#757) faf5d0521 allow CMake to switch between building SHARED (DLLs) or STATIC libraires d15173f38 export symbols used by NITRO (#756) 6ed3c048b use Debug DLL library in Debug git-subtree-dir: externals/coda-oss git-subtree-split: df4e0fc1f6c564c02121d1328e850ed92552bfc1 * Squashed 'externals/nitro/' changes from de4686af0..dc3a8ecf0 dc3a8ecf0 export more symbols (#604) 22f11f42b build as a DLL in Visual Studio (#603) 8d8184c27 NITRO can now build DLLs (#602) d3f58f038 added environment variable to enable pre-loading of TREs (#601) 85a113021 Merge branch 'main' of https://github.com/mdaus/nitro a1cec9cf6 Merge branch 'main' of https://github.com/mdaus/nitro 6801fa735 Merge branch 'main' of https://github.com/mdaus/nitro eca918471 /guard:cf 5d540334b /guard:cf git-subtree-dir: externals/nitro git-subtree-split: dc3a8ecf0e5e13c23ec1f2294c323d0bbd222e2a * latest from CODA-OSS * Squashed 'externals/coda-oss/' changes from df4e0fc1f..28926b673 28926b673 provide our own (simple) mdspan implementation (#759) 6bb722454 make SpanRC API match std::mdspan (#758) git-subtree-dir: externals/coda-oss git-subtree-split: 28926b673931c3f148882ceca7d3de203accfa4e * Squashed 'externals/nitro/' changes from dc3a8ecf0..3de4c5059 3de4c5059 latest from CODA-OSS (#605) git-subtree-dir: externals/nitro git-subtree-split: 3de4c5059eaf7d1ba2ccd1c16c7bc84efd3f028e * latest from NITRO * Squashed 'externals/nitro/' changes from 3de4c5059..09f2f458f 09f2f458f use $(SolutionDir) to get to externals git-subtree-dir: externals/nitro git-subtree-split: 09f2f458fe16fcaa6dd5f6c025b91a1ca657abe4 * latest from CODA-OSS * Squashed 'externals/coda-oss/' changes from 28926b673..ed283d676 ed283d676 Only need to actually create/destroy Xerces once (#761) 8087b1e11 utility routines to convert to/from collections of paths a869c8a8e use a lookup table for str::upper() and str::lower() (#760) 00e343177 Merge branch 'main' of https://github.com/mdaus/coda-oss 27085f06b DefaultErrorHandler is a base class 98ec79835 favor speed over size git-subtree-dir: externals/coda-oss git-subtree-split: ed283d676654023f2ea58fd7b6385fa30c03b08a * Squashed 'externals/nitro/' changes from 09f2f458f..847101014 847101014 latest from CODA-OSS (#606) git-subtree-dir: externals/nitro git-subtree-split: 8471010142ae5f85f596f2cf1737c8aa5d89c7fa * latest from CODA-OSS and NITRO * Squashed 'externals/coda-oss/' changes from ed283d676..b173830ca b173830ca fix C++17 overload resolution git-subtree-dir: externals/coda-oss git-subtree-split: b173830ca9d9946bc4375786bd39abfdbc2ed9c9 * Squashed 'externals/nitro/' changes from 847101014..f39321c67 f39321c67 latest from CODA-OSS 60952fb78 preload the remaining TREs (#607) git-subtree-dir: externals/nitro git-subtree-split: f39321c67b2bcdc2f42d81da7b10c48c0f3c7504 --- .../modules/c++/sys/include/sys/Path.h | 6 +- .../coda-oss/modules/c++/sys/source/Path.cpp | 8 +- .../c++/nitf/unittests/test_load_plugins.cpp | 5 - .../nitro/modules/c/nitf/shared/ACCVTB.c | 4 +- externals/nitro/modules/c/nitf/shared/ACFTB.c | 4 +- .../nitro/modules/c/nitf/shared/AIPBCA.c | 4 +- .../nitro/modules/c/nitf/shared/ASTORA.c | 4 +- .../nitro/modules/c/nitf/shared/BANDSA.c | 4 +- .../nitro/modules/c/nitf/shared/BANDSB.c | 4 +- .../nitro/modules/c/nitf/shared/BCKGDA.c | 4 +- .../nitro/modules/c/nitf/shared/BLOCKA.c | 4 +- .../nitro/modules/c/nitf/shared/BNDPLB.c | 4 +- .../nitro/modules/c/nitf/shared/CCINFA.c | 4 +- .../nitro/modules/c/nitf/shared/CLCTNA.c | 4 +- .../nitro/modules/c/nitf/shared/CLCTNB.c | 4 +- .../nitro/modules/c/nitf/shared/CMETAA.c | 4 +- .../nitro/modules/c/nitf/shared/CSCCGA.c | 4 +- .../nitro/modules/c/nitf/shared/CSDIDA.c | 4 +- .../nitro/modules/c/nitf/shared/CSEPHA.c | 4 +- .../nitro/modules/c/nitf/shared/CSEXRA.c | 4 +- .../nitro/modules/c/nitf/shared/CSPROA.c | 4 +- .../nitro/modules/c/nitf/shared/CSSFAA.c | 4 +- .../nitro/modules/c/nitf/shared/CSSHPA.c | 4 +- .../nitro/modules/c/nitf/shared/EXOPTA.c | 4 +- .../nitro/modules/c/nitf/shared/EXPLTA.c | 4 +- .../nitro/modules/c/nitf/shared/EXPLTB.c | 4 +- .../nitro/modules/c/nitf/shared/GEOLOB.c | 4 +- .../nitro/modules/c/nitf/shared/GEOPSB.c | 4 +- .../nitro/modules/c/nitf/shared/GRDPSB.c | 4 +- .../nitro/modules/c/nitf/shared/ICHIPB.c | 4 +- .../nitro/modules/c/nitf/shared/IMASDA.c | 4 +- .../nitro/modules/c/nitf/shared/IMGDTA.c | 4 +- .../nitro/modules/c/nitf/shared/IMRFCA.c | 4 +- .../nitro/modules/c/nitf/shared/IOMAPA.c | 4 +- .../nitro/modules/c/nitf/shared/J2KLRA.c | 4 +- .../nitro/modules/c/nitf/shared/MAPLOB.c | 4 +- .../nitro/modules/c/nitf/shared/MATESA.c | 4 +- .../nitro/modules/c/nitf/shared/MENSRA.c | 4 +- .../nitro/modules/c/nitf/shared/MENSRB.c | 4 +- .../nitro/modules/c/nitf/shared/MPDSRA.c | 4 +- .../nitro/modules/c/nitf/shared/MSDIRA.c | 4 +- .../nitro/modules/c/nitf/shared/MSTGTA.c | 4 +- .../nitro/modules/c/nitf/shared/MTIRPA.c | 4 +- .../nitro/modules/c/nitf/shared/MTIRPB.c | 4 +- .../nitro/modules/c/nitf/shared/NBLOCA.c | 4 +- .../nitro/modules/c/nitf/shared/OBJCTA.c | 4 +- .../nitro/modules/c/nitf/shared/OFFSET.c | 4 +- .../nitro/modules/c/nitf/shared/PATCHA.c | 4 +- .../nitro/modules/c/nitf/shared/PATCHB.c | 4 +- .../nitro/modules/c/nitf/shared/PIAEQA.c | 4 +- .../nitro/modules/c/nitf/shared/PIAEVA.c | 4 +- .../nitro/modules/c/nitf/shared/PIAIMB.c | 4 +- .../nitro/modules/c/nitf/shared/PIAIMC.c | 4 +- .../nitro/modules/c/nitf/shared/PIAPEA.c | 4 +- .../nitro/modules/c/nitf/shared/PIAPEB.c | 4 +- .../nitro/modules/c/nitf/shared/PIAPRC.c | 4 +- .../nitro/modules/c/nitf/shared/PIAPRD.c | 4 +- .../nitro/modules/c/nitf/shared/PIATGA.c | 4 +- .../nitro/modules/c/nitf/shared/PIATGB.c | 4 +- .../nitro/modules/c/nitf/shared/PIXQLA.c | 4 +- .../nitro/modules/c/nitf/shared/PLTFMA.c | 4 +- .../nitro/modules/c/nitf/shared/PRADAA.c | 4 +- .../nitro/modules/c/nitf/shared/PRJPSB.c | 4 +- .../nitro/modules/c/nitf/shared/REGPTB.c | 4 +- .../nitro/modules/c/nitf/shared/RPC00B.c | 4 +- .../nitro/modules/c/nitf/shared/RPFDES.c | 4 +- .../nitro/modules/c/nitf/shared/RPFIMG.c | 4 +- .../nitro/modules/c/nitf/shared/RSMAPA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMDCA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMECA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMGGA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMGIA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMIDA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMPCA.c | 4 +- .../nitro/modules/c/nitf/shared/RSMPIA.c | 4 +- .../nitro/modules/c/nitf/shared/SECTGA.c | 4 +- .../nitro/modules/c/nitf/shared/SENSRA.c | 4 +- .../nitro/modules/c/nitf/shared/SENSRB.c | 4 +- .../nitro/modules/c/nitf/shared/SNSPSB.c | 4 +- externals/nitro/modules/c/nitf/shared/SNSRA.c | 4 +- .../nitro/modules/c/nitf/shared/SOURCB.c | 4 +- .../nitro/modules/c/nitf/shared/STDIDC.c | 4 +- .../nitro/modules/c/nitf/shared/STEROB.c | 4 +- .../nitro/modules/c/nitf/shared/STREOB.c | 4 +- externals/nitro/modules/c/nitf/shared/TRGTA.c | 4 +- .../nitro/modules/c/nitf/shared/USE00A.c | 4 +- externals/nitro/modules/c/nitf/source/TREs.c | 196 ++++++++++++++++-- 87 files changed, 355 insertions(+), 192 deletions(-) diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Path.h b/externals/coda-oss/modules/c++/sys/include/sys/Path.h index 74d78af5c..cb1ba14c8 100644 --- a/externals/coda-oss/modules/c++/sys/include/sys/Path.h +++ b/externals/coda-oss/modules/c++/sys/include/sys/Path.h @@ -298,9 +298,9 @@ class CODA_OSS_API Path std::ostream& operator<<(std::ostream& os, const sys::Path& path); std::istream& operator>>(std::istream& os, sys::Path& path); -// Convert between collections of paths as strings and sys::filesystem::path -CODA_OSS_API std::vector convertPaths(coda_oss::span); -CODA_OSS_API std::vector convertPaths(coda_oss::span); +// Convert between collections of paths as strings and coda_oss::filesystem::path +CODA_OSS_API std::vector convertPaths(coda_oss::span); +CODA_OSS_API std::vector convertPaths(coda_oss::span); template inline auto convertPaths(const std::vector& paths) { diff --git a/externals/coda-oss/modules/c++/sys/source/Path.cpp b/externals/coda-oss/modules/c++/sys/source/Path.cpp index 99233b236..510e3c4c0 100644 --- a/externals/coda-oss/modules/c++/sys/source/Path.cpp +++ b/externals/coda-oss/modules/c++/sys/source/Path.cpp @@ -849,6 +849,8 @@ std::string Path::expandEnvironmentVariables(const std::string& path, fs::file_t bool unused_checkIfExists = true; return expandEnvironmentVariables_(path, unused_checkIfExists, &type); } +} // sys + template inline auto convertPaths_(coda_oss::span paths, TFunc fun) @@ -857,13 +859,11 @@ inline auto convertPaths_(coda_oss::span paths, TFunc fun) std::transform(paths.begin(), paths.end(), std::back_inserter(retval), fun); return retval; } -std::vector convertPaths(coda_oss::span paths) +std::vector sys::convertPaths(coda_oss::span paths) { return convertPaths_(paths, [](const auto& p) { return p.string(); }); } -std::vector convertPaths(coda_oss::span paths) +std::vector sys::convertPaths(coda_oss::span paths) { return convertPaths_(paths, [](const auto& p) { return p; }); } - -} \ No newline at end of file diff --git a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp b/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp index 9e59a2405..91b497968 100644 --- a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp +++ b/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp @@ -49,10 +49,6 @@ static const auto& all_TREs() { static const std::vector retval { - #if _MSC_VER && NITRO_PCH - // only build a handful in Visual Studio - "ACCHZB", "ACCPOB", "ACFTA", "AIMIDB", "CSCRNA", "CSEXRB", "ENGRDA", "HISTOA", "JITCID", "PTPRAA", "RPFHDR", - #else "ACCHZB", "BANDSB", "CSDIDA", "GEOLOB", "JITCID", "NBLOCA", "PIAPEB", "REGPTB", "RSMIDA", "STEROB", "ACCPOB", "BCKGDA", "CSEPHA", "GEOPSB", "MAPLOB", "OBJCTA", "PIAPRC", "RPC00B", "RSMPCA", "STREOB", "ACCVTB", "BLOCKA", "CSEXRA", "GRDPSB", "MATESA", "OFFSET", "PIAPRD", "RPFDES", "RSMPIA", "TEST_DES", @@ -63,7 +59,6 @@ static const auto& all_TREs() "AIPBCA", "CMETAA", "EXOPTA", "IMRFCA", "MSTGTA", "PIAIMB", "PRADAA", "RSMECA", "SNSRA", "ASTORA", "CSCCGA", "EXPLTA", "IOMAPA", "MTIRPA", "PIAIMC", "PRJPSB", "RSMGGA", "SOURCB", "BANDSA", "CSCRNA", "EXPLTB", "J2KLRA", "MTIRPB", "PIAPEA", "PTPRAA", "RSMGIA", "STDIDC", - #endif }; return retval; } diff --git a/externals/nitro/modules/c/nitf/shared/ACCVTB.c b/externals/nitro/modules/c/nitf/shared/ACCVTB.c index ed47e56d5..61656f12c 100644 --- a/externals/nitro/modules/c/nitf/shared/ACCVTB.c +++ b/externals/nitro/modules/c/nitf/shared/ACCVTB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription ACCVTB_description[] = { {NITF_BCS_N, 2, "Number of vertical accuracy regions", "NUMACVT" }, {NITF_LOOP, 0, NULL, "NUMACVT"}, @@ -46,6 +46,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(ACCVTB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ACCVTB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/ACFTB.c b/externals/nitro/modules/c/nitf/shared/ACFTB.c index 0d1d335ad..f85afbf08 100644 --- a/externals/nitro/modules/c/nitf/shared/ACFTB.c +++ b/externals/nitro/modules/c/nitf/shared/ACFTB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription ACFTB_description[] = { {NITF_BCS_A, 20, "Aircraft Mission ID", "AC_MSN_ID" }, {NITF_BCS_A, 10, "Aircraft Tail Number", "AC_TAIL_NO" }, {NITF_BCS_A, 12, "Acrft Takeoff Date/Time", "AC_TO" }, @@ -56,6 +56,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(ACFTB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ACFTB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/AIPBCA.c b/externals/nitro/modules/c/nitf/shared/AIPBCA.c index 011edb836..5663b65a0 100644 --- a/externals/nitro/modules/c/nitf/shared/AIPBCA.c +++ b/externals/nitro/modules/c/nitf/shared/AIPBCA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription AIPBCA_description[] = { {NITF_BCS_N, 5, "Patch Width", "Patch_Width", }, {NITF_BCS_A, 16, "Semi-major axis (x component)", "u_hat_x" }, {NITF_BCS_A, 16, "Semi-major axis (y component)", "u_hat_y" }, @@ -78,6 +78,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(AIPBCA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(AIPBCA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/ASTORA.c b/externals/nitro/modules/c/nitf/shared/ASTORA.c index 352d88e10..e372f9c7b 100644 --- a/externals/nitro/modules/c/nitf/shared/ASTORA.c +++ b/externals/nitro/modules/c/nitf/shared/ASTORA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription ASTORA_description[] = { {NITF_BCS_N, 6, "Number of rows in full image prod.", "IMG_TOTAL_ROWS" }, {NITF_BCS_N, 6, "Number of columns in full image prod.", @@ -174,6 +174,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(ASTORA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ASTORA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/BANDSA.c b/externals/nitro/modules/c/nitf/shared/BANDSA.c index f5f75a3f7..f5d2e1595 100644 --- a/externals/nitro/modules/c/nitf/shared/BANDSA.c +++ b/externals/nitro/modules/c/nitf/shared/BANDSA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription BANDSA_description[] = { {NITF_BCS_A, 7, "ROW_SPACING", "ROW_SPACING" }, {NITF_BCS_A, 1, "ROW_SPACING_UNITS", "ROW_SPACING_UNITS" }, {NITF_BCS_A, 7, "COL_SPACING", "COL_SPACING" }, @@ -45,6 +45,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(BANDSA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BANDSA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/BANDSB.c b/externals/nitro/modules/c/nitf/shared/BANDSB.c index b9e82039c..69f8711cb 100644 --- a/externals/nitro/modules/c/nitf/shared/BANDSB.c +++ b/externals/nitro/modules/c/nitf/shared/BANDSB.c @@ -26,7 +26,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription BANDSB_description[] = { {NITF_BCS_N, 5, "Number of Bands", "COUNT" }, {NITF_BCS_A, 24, "Data Representation", "RADIOMETRIC_QUANTITY" }, {NITF_BCS_A, 1, "Data Representation Unit", "RADIOMETRIC_QUANTITY_UNIT" }, @@ -191,7 +191,7 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(BANDSB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BANDSB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/BCKGDA.c b/externals/nitro/modules/c/nitf/shared/BCKGDA.c index df7a57e80..c48cb5cd9 100644 --- a/externals/nitro/modules/c/nitf/shared/BCKGDA.c +++ b/externals/nitro/modules/c/nitf/shared/BCKGDA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription BCKGDA_description[] = { {NITF_BCS_N, 8, "Background Width", "BGWIDTH" }, {NITF_BCS_N, 8, "Background Height", "BGHEIGHT" }, {NITF_BCS_N, 8, "Background Red", "BGRED" }, @@ -35,6 +35,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(BCKGDA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BCKGDA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/BLOCKA.c b/externals/nitro/modules/c/nitf/shared/BLOCKA.c index 47404830d..d207d3281 100644 --- a/externals/nitro/modules/c/nitf/shared/BLOCKA.c +++ b/externals/nitro/modules/c/nitf/shared/BLOCKA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription BLOCKA_description[] = { {NITF_BCS_N, 2, "Block Number", "BLOCK_INSTANCE" }, {NITF_BCS_A, 5, "No. of Gray Pixels", "N_GRAY" }, {NITF_BCS_N, 5, "Lines", "L_LINES" }, @@ -40,6 +40,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(BLOCKA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BLOCKA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/BNDPLB.c b/externals/nitro/modules/c/nitf/shared/BNDPLB.c index 4405fdea3..073395c54 100644 --- a/externals/nitro/modules/c/nitf/shared/BNDPLB.c +++ b/externals/nitro/modules/c/nitf/shared/BNDPLB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription BNDPLB_description[] = { {NITF_BCS_N, 4, "Number of Points in Bounding Polygon", "NUMPTS" }, {NITF_LOOP, 0, NULL, "NUMPTS"}, {NITF_BCS_N, 15, "Longitude/Easting", "LON" }, @@ -33,6 +33,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(BNDPLB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(BNDPLB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CCINFA.c b/externals/nitro/modules/c/nitf/shared/CCINFA.c index df154dfaf..0145c3e20 100644 --- a/externals/nitro/modules/c/nitf/shared/CCINFA.c +++ b/externals/nitro/modules/c/nitf/shared/CCINFA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CCINFA_description[] = { {NITF_BCS_N, 3, "Number of defined codes", "NUMCODE" }, {NITF_LOOP, 0, NULL, "NUMCODE"}, {NITF_BCS_N, 1, "Length of the CODE field", "CODE_LEN" }, @@ -43,6 +43,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CCINFA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CCINFA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNA.c b/externals/nitro/modules/c/nitf/shared/CLCTNA.c index 633ea16ad..c5d6ebe89 100644 --- a/externals/nitro/modules/c/nitf/shared/CLCTNA.c +++ b/externals/nitro/modules/c/nitf/shared/CLCTNA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CLCTNA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_A, 25, "CLCTN_NAME", "CLCTN_NAME" }, {NITF_BCS_A, 255, "CLCTN_DESCRIPT", "CLCTN_DESCRIPT" }, @@ -57,6 +57,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CLCTNA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CLCTNA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CLCTNB.c b/externals/nitro/modules/c/nitf/shared/CLCTNB.c index 3a0bb037a..6b738b345 100644 --- a/externals/nitro/modules/c/nitf/shared/CLCTNB.c +++ b/externals/nitro/modules/c/nitf/shared/CLCTNB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CLCTNB_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_A, 25, "CLCTN_NAME", "CLCTN_NAME" }, {NITF_BCS_A, 255, "CLCTN_DESCRIPT", "CLCTN_DESCRIPT" }, @@ -61,6 +61,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CLCTNB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CLCTNB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CMETAA.c b/externals/nitro/modules/c/nitf/shared/CMETAA.c index 2168de977..811e40d6e 100644 --- a/externals/nitro/modules/c/nitf/shared/CMETAA.c +++ b/externals/nitro/modules/c/nitf/shared/CMETAA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CMETAA_description[] = { {NITF_BCS_N, 2, "Number of Related TREs", "RELATED_TRES" }, {NITF_BCS_A, 120, "Related TREs", "ADDITIONAL_TRES" }, {NITF_BCS_A, 12, "Processor Version No.", "RD_PRC_NO" }, @@ -238,6 +238,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CMETAA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CMETAA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSCCGA.c b/externals/nitro/modules/c/nitf/shared/CSCCGA.c index f3161c21f..78d7d11c1 100644 --- a/externals/nitro/modules/c/nitf/shared/CSCCGA.c +++ b/externals/nitro/modules/c/nitf/shared/CSCCGA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSCCGA_description[] = { {NITF_BCS_A, 18, "Source of Grid", "CCG_SOURCE" }, {NITF_BCS_A, 6, "Image Segment Sensor to which CCG is registered", "REG_SENSOR" }, {NITF_BCS_N, 7, "CCG Origin - Line", "ORIGIN_LINE" }, @@ -37,6 +37,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSCCGA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSCCGA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSDIDA.c b/externals/nitro/modules/c/nitf/shared/CSDIDA.c index ab11b4fff..0e42f9124 100644 --- a/externals/nitro/modules/c/nitf/shared/CSDIDA.c +++ b/externals/nitro/modules/c/nitf/shared/CSDIDA.c @@ -26,7 +26,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSDIDA_description[] = { {NITF_BCS_N, 2, "Day of Dataset Collection", "DAY" }, {NITF_BCS_A, 3, "Month of Dataset Collection", "MONTH" }, {NITF_BCS_N, 4, "Year of Dataset Collection", "YEAR" }, @@ -47,7 +47,7 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSDIDA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSDIDA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSEPHA.c b/externals/nitro/modules/c/nitf/shared/CSEPHA.c index e3dd2a7b9..f2fdacab6 100644 --- a/externals/nitro/modules/c/nitf/shared/CSEPHA.c +++ b/externals/nitro/modules/c/nitf/shared/CSEPHA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSEPHA_description[] = { {NITF_BCS_A, 12, "ephemeris flag", "EPHEM_FLAG" }, {NITF_BCS_N, 5, "time b/w eph vectors", "DT_EPHEM" }, {NITF_BCS_N, 8, "day of first eph vector", "DATE_EPHEM" }, @@ -39,6 +39,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSEPHA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSEPHA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSEXRA.c b/externals/nitro/modules/c/nitf/shared/CSEXRA.c index 9eec1eb45..b3fd23717 100644 --- a/externals/nitro/modules/c/nitf/shared/CSEXRA.c +++ b/externals/nitro/modules/c/nitf/shared/CSEXRA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSEXRA_description[] = { {NITF_BCS_A, 6, "Sensor", "SENSOR" }, {NITF_BCS_N, 12, "Time of the First Line of Image", "TIME_FIRST_LINE_IMAGE" }, {NITF_BCS_N, 12, "Image Duration Time", "TIME_IMAGE_DURATION" }, @@ -52,6 +52,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSEXRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSEXRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSPROA.c b/externals/nitro/modules/c/nitf/shared/CSPROA.c index f4240bed4..e77ccf6d1 100644 --- a/externals/nitro/modules/c/nitf/shared/CSPROA.c +++ b/externals/nitro/modules/c/nitf/shared/CSPROA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSPROA_description[] = { {NITF_BCS_A, 12, "fill0", "RESERVED_0" }, {NITF_BCS_A, 12, "fill1", "RESERVED_1" }, {NITF_BCS_A, 12, "fill2", "RESERVED_2" }, @@ -39,6 +39,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSPROA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSPROA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSSFAA.c b/externals/nitro/modules/c/nitf/shared/CSSFAA.c index 4e7f7e38c..3f0a40c2c 100644 --- a/externals/nitro/modules/c/nitf/shared/CSSFAA.c +++ b/externals/nitro/modules/c/nitf/shared/CSSFAA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSSFAA_description[] = { {NITF_BCS_N, 1, "number of bands", "NUM_BANDS" }, {NITF_LOOP, 0, NULL, "NUM_BANDS"}, {NITF_BCS_A, 1, "band category", "BAND_TYPE" }, @@ -45,6 +45,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSSFAA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSSFAA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/CSSHPA.c b/externals/nitro/modules/c/nitf/shared/CSSHPA.c index cdd8fe30b..706471841 100644 --- a/externals/nitro/modules/c/nitf/shared/CSSHPA.c +++ b/externals/nitro/modules/c/nitf/shared/CSSHPA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription CSSHPA_description[] = { {NITF_BCS_A, 25, "Shapefile Use", "SHAPE_USE" }, {NITF_BCS_A, 10, "Type of shapes", "SHAPE_CLASS" }, {NITF_IF, 0, "eq CLOUD_SHAPES ", "SHAPE_USE"}, @@ -40,6 +40,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(CSSHPA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(CSSHPA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/EXOPTA.c b/externals/nitro/modules/c/nitf/shared/EXOPTA.c index ea85419df..63a567210 100644 --- a/externals/nitro/modules/c/nitf/shared/EXOPTA.c +++ b/externals/nitro/modules/c/nitf/shared/EXOPTA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription EXOPTA_description[] = { {NITF_BCS_A, 3, "ANGLE TO NORTH", "ANGLETONORTH" }, {NITF_BCS_A, 5, "MEAN GSD", "MEANGSD" }, {NITF_BCS_A, 1, "Reserved 1", "RESERV01" }, @@ -46,6 +46,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(EXOPTA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(EXOPTA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTA.c b/externals/nitro/modules/c/nitf/shared/EXPLTA.c index b7e0c9764..f7b2618a2 100644 --- a/externals/nitro/modules/c/nitf/shared/EXPLTA.c +++ b/externals/nitro/modules/c/nitf/shared/EXPLTA.c @@ -68,12 +68,12 @@ static nitf_TREDescription descrip_00101[] = { }; /* Define the available descriptions and the default one */ -static nitf_TREDescriptionInfo descriptions[] = { +static nitf_TREDescriptionInfo EXPLTA_descriptions[] = { { "EXPLTA_87", descrip_00087, 87 }, { "EXPLTA_101", descrip_00101, 101 }, { NULL, NULL, NITF_TRE_DESC_NO_LENGTH } }; -static nitf_TREDescriptionSet EXPLTADescriptionSet = { 0, descriptions }; +static nitf_TREDescriptionSet EXPLTADescriptionSet = { 0, EXPLTA_descriptions }; NITF_DECLARE_PLUGIN(EXPLTA) diff --git a/externals/nitro/modules/c/nitf/shared/EXPLTB.c b/externals/nitro/modules/c/nitf/shared/EXPLTB.c index e99a2285e..5780ce1d4 100644 --- a/externals/nitro/modules/c/nitf/shared/EXPLTB.c +++ b/externals/nitro/modules/c/nitf/shared/EXPLTB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription EXPLTB_description[] = { {NITF_BCS_A, 7, "Angle to True North", "ANGLE_TO_NORTH" }, {NITF_BCS_A, 6, "Angle North Accuracy", "ANGLE_TO_NORTH_ACCY" }, {NITF_BCS_A, 7, "Squint Angle", "SQUINT_ANGLE" }, @@ -47,6 +47,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(EXPLTB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(EXPLTB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/GEOLOB.c b/externals/nitro/modules/c/nitf/shared/GEOLOB.c index 2a04b5f5b..17107184d 100644 --- a/externals/nitro/modules/c/nitf/shared/GEOLOB.c +++ b/externals/nitro/modules/c/nitf/shared/GEOLOB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription GEOLOB_description[] = { {NITF_BCS_N, 9, "Longitude density", "ARV" }, {NITF_BCS_N, 9, "Latitude density", "BRV" }, {NITF_BCS_N, 15, "Longitude of Reference Origin", "LSO" }, @@ -32,6 +32,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(GEOLOB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GEOLOB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/GEOPSB.c b/externals/nitro/modules/c/nitf/shared/GEOPSB.c index 076b59735..08fbf7601 100644 --- a/externals/nitro/modules/c/nitf/shared/GEOPSB.c +++ b/externals/nitro/modules/c/nitf/shared/GEOPSB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription GEOPSB_description[] = { {NITF_BCS_A, 3, "Coordinate System Type", "TYP" }, {NITF_BCS_A, 3, "Coordinate Units", "UNI" }, {NITF_BCS_A, 80, "Geodetic Datum Name", "DAG" }, @@ -42,6 +42,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(GEOPSB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GEOPSB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/GRDPSB.c b/externals/nitro/modules/c/nitf/shared/GRDPSB.c index d23f4f372..c131467a3 100644 --- a/externals/nitro/modules/c/nitf/shared/GRDPSB.c +++ b/externals/nitro/modules/c/nitf/shared/GRDPSB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription GRDPSB_description[] = { {NITF_BCS_N, 2, "Number of Location Grids", "NUM_GRDS" }, {NITF_LOOP, 0, NULL, "NUM_GRDS"}, @@ -42,6 +42,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL }, }; -NITF_DECLARE_SINGLE_PLUGIN(GRDPSB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(GRDPSB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/ICHIPB.c b/externals/nitro/modules/c/nitf/shared/ICHIPB.c index d1f4d6c0f..3f282b6bc 100644 --- a/externals/nitro/modules/c/nitf/shared/ICHIPB.c +++ b/externals/nitro/modules/c/nitf/shared/ICHIPB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription ICHIPB_description[] = { {NITF_BCS_A, 2, "Non-linear transform flag", "XFRM_FLAG" }, {NITF_BCS_A, 10, "Scale Factor Relative to RO", "SCALE_FACTOR" }, {NITF_BCS_A, 2, "Anamorphic Correction Indicator", "ANAMRPH_CORR" }, @@ -99,6 +99,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(ICHIPB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(ICHIPB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/IMASDA.c b/externals/nitro/modules/c/nitf/shared/IMASDA.c index 4ce04defb..0e7a2c429 100644 --- a/externals/nitro/modules/c/nitf/shared/IMASDA.c +++ b/externals/nitro/modules/c/nitf/shared/IMASDA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD // MIL-PRF-89034, Table 68 (page 131). -static nitf_TREDescription description[] = { +static nitf_TREDescription IMASDA_description[] = { {NITF_BCS_A, 22, "Longitude Translation", "LONTR" }, {NITF_BCS_A, 22, "Latitude Translation", "LATTR" }, {NITF_BCS_A, 22, "Elevation Translation", "ELVTR" }, @@ -40,6 +40,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(IMASDA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMASDA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/IMGDTA.c b/externals/nitro/modules/c/nitf/shared/IMGDTA.c index 550390ac5..750cac15c 100644 --- a/externals/nitro/modules/c/nitf/shared/IMGDTA.c +++ b/externals/nitro/modules/c/nitf/shared/IMGDTA.c @@ -27,7 +27,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription IMGDTA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_A, 32, "FILENAME", "FILENAME" }, {NITF_BCS_A, 32, "PARENT_FNAME", "PARENT_FNAME" }, @@ -96,6 +96,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(IMGDTA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMGDTA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/IMRFCA.c b/externals/nitro/modules/c/nitf/shared/IMRFCA.c index 8e0b244f3..517209ff9 100644 --- a/externals/nitro/modules/c/nitf/shared/IMRFCA.c +++ b/externals/nitro/modules/c/nitf/shared/IMRFCA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD // MIL-PRF-89034, Table 69 (page 131). -static nitf_TREDescription description[] = { +static nitf_TREDescription IMRFCA_description[] = { {NITF_LOOP, 0, NITF_CONST_N, "20"}, {NITF_BCS_A, 22, "X Image Numerator", "XINC" }, {NITF_ENDLOOP, 0, NULL, NULL}, @@ -41,6 +41,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(IMRFCA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(IMRFCA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/IOMAPA.c b/externals/nitro/modules/c/nitf/shared/IOMAPA.c index 754055e18..feee71418 100644 --- a/externals/nitro/modules/c/nitf/shared/IOMAPA.c +++ b/externals/nitro/modules/c/nitf/shared/IOMAPA.c @@ -74,14 +74,14 @@ static nitf_TREDescription descrip_00091[] = { }; /* Define the available descriptions and the default one */ -static nitf_TREDescriptionInfo descriptions[] = { +static nitf_TREDescriptionInfo IOMAPA_descriptions[] = { { "IOMAPA_6", descrip_00006, 6 }, { "IOMAPA_8202", descrip_08202, 8202 }, { "IOMAPA_16", descrip_00016, 16 }, { "IOMAPA_91", descrip_00091, 91 }, { NULL, NULL, NITF_TRE_DESC_NO_LENGTH } }; -static nitf_TREDescriptionSet IOMAPADescriptionSet = { 0, descriptions }; +static nitf_TREDescriptionSet IOMAPADescriptionSet = { 0, IOMAPA_descriptions }; NITF_DECLARE_PLUGIN(IOMAPA) diff --git a/externals/nitro/modules/c/nitf/shared/J2KLRA.c b/externals/nitro/modules/c/nitf/shared/J2KLRA.c index 43fdea794..3f5a435fe 100644 --- a/externals/nitro/modules/c/nitf/shared/J2KLRA.c +++ b/externals/nitro/modules/c/nitf/shared/J2KLRA.c @@ -26,7 +26,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription J2KLRA_description[] = { {NITF_BCS_N, 1, "original compressed data", "ORIG" }, {NITF_BCS_N, 2, "number wavelet levels", "NLEVELS_O" }, {NITF_BCS_N, 5, "number bands", "NBANDS_O" }, @@ -55,6 +55,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(J2KLRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(J2KLRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MAPLOB.c b/externals/nitro/modules/c/nitf/shared/MAPLOB.c index 65fd8ef05..9116fd154 100644 --- a/externals/nitro/modules/c/nitf/shared/MAPLOB.c +++ b/externals/nitro/modules/c/nitf/shared/MAPLOB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MAPLOB_description[] = { {NITF_BCS_A, 3, "Length units", "UNILOA" }, {NITF_BCS_N, 5, "Easting interval", "LOD" }, {NITF_BCS_N, 5, "Northing interval", "LAD" }, @@ -33,6 +33,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MAPLOB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MAPLOB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MATESA.c b/externals/nitro/modules/c/nitf/shared/MATESA.c index abc0765ab..8bb86a973 100644 --- a/externals/nitro/modules/c/nitf/shared/MATESA.c +++ b/externals/nitro/modules/c/nitf/shared/MATESA.c @@ -27,7 +27,7 @@ NITF_CXX_GUARD /* From STDI-0002-1 Appendix AK: Table AK.6-5: MATESA */ -static nitf_TREDescription description[] = { +static nitf_TREDescription MATESA_description[] = { {NITF_BCS_A, 42, "Current File/Segment Source", "CUR_SOURCE" }, {NITF_BCS_A, 16, "Current File/Segment Mate Type", "CUR_MATE_TYPE" }, {NITF_BCS_N, 4, "Length of the CUR_FILE_ID field", "CUR_FILE_ID_LEN" }, @@ -46,6 +46,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL }, }; -NITF_DECLARE_SINGLE_PLUGIN(MATESA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MATESA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MENSRA.c b/externals/nitro/modules/c/nitf/shared/MENSRA.c index f59ae864d..0acad0841 100644 --- a/externals/nitro/modules/c/nitf/shared/MENSRA.c +++ b/externals/nitro/modules/c/nitf/shared/MENSRA.c @@ -103,13 +103,13 @@ static nitf_TREDescription descrip_00185[] = { }; /* Define the available descriptions and the default one */ -static nitf_TREDescriptionInfo descriptions[] = { +static nitf_TREDescriptionInfo MENSRA_descriptions[] = { { "MENSRA_155", descrip_00155, 155 }, { "MENSRA_174", descrip_00174, 174 }, { "MENSRA_185", descrip_00185, 185 }, { NULL, NULL, NITF_TRE_DESC_NO_LENGTH } }; -static nitf_TREDescriptionSet MENSRADescriptionSet = { 0, descriptions }; +static nitf_TREDescriptionSet MENSRADescriptionSet = { 0, MENSRA_descriptions }; NITF_DECLARE_PLUGIN(MENSRA) diff --git a/externals/nitro/modules/c/nitf/shared/MENSRB.c b/externals/nitro/modules/c/nitf/shared/MENSRB.c index 3ff1de0ed..93299d35d 100644 --- a/externals/nitro/modules/c/nitf/shared/MENSRB.c +++ b/externals/nitro/modules/c/nitf/shared/MENSRB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MENSRB_description[] = { {NITF_BCS_A, 25, "Aircraft Location", "ACFT_LOC" }, {NITF_BCS_A, 6, "Aircraft Location Accuracy", "ACFT_LOC_ACCY" }, {NITF_BCS_A, 6, "Aircraft Altitude", "ACFT_ALT" }, @@ -55,6 +55,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MENSRB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MENSRB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MPDSRA.c b/externals/nitro/modules/c/nitf/shared/MPDSRA.c index 4f4647131..03826604a 100644 --- a/externals/nitro/modules/c/nitf/shared/MPDSRA.c +++ b/externals/nitro/modules/c/nitf/shared/MPDSRA.c @@ -27,7 +27,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MPDSRA_description[] = { {NITF_BCS_A, 2, "Image Block Number", "blkno" }, {NITF_BCS_A, 2, "Commanded IPR", "cdipr" }, {NITF_BCS_N, 2, "No of Blocks in WDG", "nblkw" }, @@ -56,6 +56,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MPDSRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MPDSRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MSDIRA.c b/externals/nitro/modules/c/nitf/shared/MSDIRA.c index b65a97cb7..68c6c057a 100644 --- a/externals/nitro/modules/c/nitf/shared/MSDIRA.c +++ b/externals/nitro/modules/c/nitf/shared/MSDIRA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD // MIL-PRF-89034, Table 7 (page 46). -static nitf_TREDescription description[] = { +static nitf_TREDescription MSDIRA_description[] = { {NITF_BCS_A, 9, "Product ID", "PRODID" }, {NITF_BCS_N, 2, "Product Volume", "PRODVOL" }, {NITF_BCS_N, 2, "Product Total Volume", "PRODTOTVOLS" }, @@ -45,6 +45,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MSDIRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MSDIRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MSTGTA.c b/externals/nitro/modules/c/nitf/shared/MSTGTA.c index 1274cbebb..1b8bafb9c 100644 --- a/externals/nitro/modules/c/nitf/shared/MSTGTA.c +++ b/externals/nitro/modules/c/nitf/shared/MSTGTA.c @@ -24,7 +24,7 @@ #include NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MSTGTA_description[] = { {NITF_BCS_A, 5, "TGT NUM", "TGTNUM" }, {NITF_BCS_A, 12, "TGT ID", "TGTID" }, {NITF_BCS_A, 15, "TGT BE", "TGTBE" }, @@ -41,6 +41,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MSTGTA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MSTGTA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPA.c b/externals/nitro/modules/c/nitf/shared/MTIRPA.c index 1bd160b41..3bab9d2d3 100644 --- a/externals/nitro/modules/c/nitf/shared/MTIRPA.c +++ b/externals/nitro/modules/c/nitf/shared/MTIRPA.c @@ -27,7 +27,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MTIRPA_description[] = { {NITF_BCS_A, 2, "Destination Point", "destp" }, {NITF_BCS_A, 3, "MTI Packet ID No.", "mtpid" }, {NITF_BCS_A, 4, "Patch Number", "pchno" }, @@ -48,6 +48,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MTIRPA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MTIRPA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/MTIRPB.c b/externals/nitro/modules/c/nitf/shared/MTIRPB.c index f3632c347..73b2725d0 100644 --- a/externals/nitro/modules/c/nitf/shared/MTIRPB.c +++ b/externals/nitro/modules/c/nitf/shared/MTIRPB.c @@ -27,7 +27,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription MTIRPB_description[] = { {NITF_BCS_A, 2, "Destination Point", "destp" }, {NITF_BCS_A, 3, "MTI Packet ID No.", "mtpid" }, {NITF_BCS_A, 4, "Patch Number", "pchno" }, @@ -54,6 +54,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(MTIRPB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(MTIRPB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/NBLOCA.c b/externals/nitro/modules/c/nitf/shared/NBLOCA.c index a03754f63..d94f3a243 100644 --- a/externals/nitro/modules/c/nitf/shared/NBLOCA.c +++ b/externals/nitro/modules/c/nitf/shared/NBLOCA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription NBLOCA_description[] = { {NITF_BINARY, 4, "First Image Frame Offset", "FRAME_1_OFFSET" }, {NITF_BINARY, 4, "Number of Blocks", "NUMBER_OF_FRAMES" }, {NITF_LOOP, 0, "- 1", "NUMBER_OF_FRAMES"}, @@ -33,6 +33,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(NBLOCA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(NBLOCA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/OBJCTA.c b/externals/nitro/modules/c/nitf/shared/OBJCTA.c index f8d6f1a9b..394c71e01 100644 --- a/externals/nitro/modules/c/nitf/shared/OBJCTA.c +++ b/externals/nitro/modules/c/nitf/shared/OBJCTA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription OBJCTA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_N, 3, "NUM_OBJ", "NUM_OBJ" }, {NITF_BCS_A, 10, "OBJ_REF", "OBJ_REF" }, @@ -65,6 +65,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(OBJCTA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(OBJCTA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/OFFSET.c b/externals/nitro/modules/c/nitf/shared/OFFSET.c index 6297254be..2e118dd66 100644 --- a/externals/nitro/modules/c/nitf/shared/OFFSET.c +++ b/externals/nitro/modules/c/nitf/shared/OFFSET.c @@ -24,12 +24,12 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription OFFSET_description[] = { {NITF_BCS_N, 8, "Align-Scan Offset of First Pixel", "LINE" }, {NITF_BCS_N, 8, "Cross-Scan Offset of First Pixel", "SAMPLE" }, {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(OFFSET, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(OFFSET) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PATCHA.c b/externals/nitro/modules/c/nitf/shared/PATCHA.c index 5a098505a..0e99f6321 100644 --- a/externals/nitro/modules/c/nitf/shared/PATCHA.c +++ b/externals/nitro/modules/c/nitf/shared/PATCHA.c @@ -69,13 +69,13 @@ static nitf_TREDescription descrip_00115[] = { }; /* Define the available descriptions and the default one */ -static nitf_TREDescriptionInfo descriptions[] = { +static nitf_TREDescriptionInfo PATCHA_descriptions[] = { { "PATCHA_115", descrip_00115, 115 }, { "PATCHA_74", descrip_00074, 74 }, { NULL, NULL, NITF_TRE_DESC_NO_LENGTH } }; -static nitf_TREDescriptionSet PATCHADescriptionSet = { 0, descriptions }; +static nitf_TREDescriptionSet PATCHADescriptionSet = { 0, PATCHA_descriptions }; NITF_DECLARE_PLUGIN(PATCHA) diff --git a/externals/nitro/modules/c/nitf/shared/PATCHB.c b/externals/nitro/modules/c/nitf/shared/PATCHB.c index fc335b53d..ef1e3f3db 100644 --- a/externals/nitro/modules/c/nitf/shared/PATCHB.c +++ b/externals/nitro/modules/c/nitf/shared/PATCHB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PATCHB_description[] = { {NITF_BCS_A, 4, "Patch Number", "PAT_NO" }, {NITF_BCS_A, 1, "Last Patch of Search Scene", "LAST_PAT_FLAG" }, @@ -52,6 +52,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PATCHB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PATCHB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAEQA.c b/externals/nitro/modules/c/nitf/shared/PIAEQA.c index f8ae90e2d..1897b35dd 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAEQA.c +++ b/externals/nitro/modules/c/nitf/shared/PIAEQA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAEQA_description[] = { {NITF_BCS_A, 7, "Equipment Code", "EQPCODE" }, {NITF_BCS_A, 45, "Equipment Nomenclature", "EQPNOMEN" }, {NITF_BCS_A, 64, "Equipment Manufacturer", "EQPMAN" }, @@ -37,6 +37,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAEQA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAEQA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAEVA.c b/externals/nitro/modules/c/nitf/shared/PIAEVA.c index 2fb845d91..ecfd6ce32 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAEVA.c +++ b/externals/nitro/modules/c/nitf/shared/PIAEVA.c @@ -25,12 +25,12 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAEVA_description[] = { {NITF_BCS_A, 38, "Event Name", "EVENTNAME" }, {NITF_BCS_A, 8, "Event Type", "EVENTTYPE" }, {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAEVA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAEVA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMB.c b/externals/nitro/modules/c/nitf/shared/PIAIMB.c index bb8b6571d..a6ca4c06a 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAIMB.c +++ b/externals/nitro/modules/c/nitf/shared/PIAIMB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAIMB_description[] = { {NITF_BCS_A, 3, "Cloud Cover", "cloud" }, {NITF_BCS_A, 1, "Standard Radiometric?", "stdrd" }, {NITF_BCS_A, 12, "Sensor Mode", "smode" }, @@ -42,6 +42,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAIMB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAIMB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAIMC.c b/externals/nitro/modules/c/nitf/shared/PIAIMC.c index 54cacc896..2127d510f 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAIMC.c +++ b/externals/nitro/modules/c/nitf/shared/PIAIMC.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAIMC_description[] = { {NITF_BCS_N, 3, "Cloud Cover", "CLOUDCVR" }, {NITF_BCS_A, 1, "Standard Radiometric Product", "SRP" }, {NITF_BCS_A, 12, "Sensor Mode", "SENSMODE" }, @@ -48,6 +48,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAIMC, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAIMC) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEA.c b/externals/nitro/modules/c/nitf/shared/PIAPEA.c index 48b7aedf5..b56c13822 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAPEA.c +++ b/externals/nitro/modules/c/nitf/shared/PIAPEA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAPEA_description[] = { {NITF_BCS_A, 28, "Last Name", "LASTNME" }, {NITF_BCS_A, 28, "First Name", "FIRSTNME" }, {NITF_BCS_A, 28, "Middle Name", "MIDNME" }, @@ -33,6 +33,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAPEA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPEA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAPEB.c b/externals/nitro/modules/c/nitf/shared/PIAPEB.c index e1bb1a499..fa0857b51 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAPEB.c +++ b/externals/nitro/modules/c/nitf/shared/PIAPEB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAPEB_description[] = { {NITF_BCS_A, 28, "Last Name", "LASTNME" }, {NITF_BCS_A, 28, "First Name", "FIRSTNME" }, {NITF_BCS_A, 28, "Middle Name", "MIDNME" }, @@ -34,6 +34,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAPEB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPEB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRC.c b/externals/nitro/modules/c/nitf/shared/PIAPRC.c index 2b70f98c1..a5246ff10 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAPRC.c +++ b/externals/nitro/modules/c/nitf/shared/PIAPRC.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAPRC_description[] = { {NITF_BCS_A, 64, "Access ID", "accid" }, {NITF_BCS_A, 32, "FM Control Number", "fmctl" }, {NITF_BCS_A, 1, "Subjective Detail", "sdet" }, @@ -76,6 +76,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAPRC, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPRC) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIAPRD.c b/externals/nitro/modules/c/nitf/shared/PIAPRD.c index de004d713..59f1e752b 100644 --- a/externals/nitro/modules/c/nitf/shared/PIAPRD.c +++ b/externals/nitro/modules/c/nitf/shared/PIAPRD.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIAPRD_description[] = { {NITF_BCS_A, 64, "Access ID", "ACCESSID" }, {NITF_BCS_A, 32, "FM Control Number", "FMCNTROL" }, {NITF_BCS_A, 1, "Subjective Detail", "SUBDET" }, @@ -61,6 +61,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIAPRD, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIAPRD) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIATGA.c b/externals/nitro/modules/c/nitf/shared/PIATGA.c index 6084ea95a..152c38bf7 100644 --- a/externals/nitro/modules/c/nitf/shared/PIATGA.c +++ b/externals/nitro/modules/c/nitf/shared/PIATGA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIATGA_description[] = { {NITF_BCS_A, 15, "Target UTM", "TGTUTM" }, {NITF_BCS_A, 15, "Target ID", "PIATGAID" }, {NITF_BCS_A, 2, "Country Code", "PIACTRY" }, @@ -36,6 +36,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIATGA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIATGA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIATGB.c b/externals/nitro/modules/c/nitf/shared/PIATGB.c index e8d84494a..abbc09d82 100644 --- a/externals/nitro/modules/c/nitf/shared/PIATGB.c +++ b/externals/nitro/modules/c/nitf/shared/PIATGB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIATGB_description[] = { {NITF_BCS_A, 15, "Target UTM", "TGTUTM" }, {NITF_BCS_A, 15, "Target Identification", "PIATGAID" }, {NITF_BCS_A, 2, "Country Code", "PIACTRY" }, @@ -38,6 +38,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIATGB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIATGB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PIXQLA.c b/externals/nitro/modules/c/nitf/shared/PIXQLA.c index 43926113d..90fad615b 100644 --- a/externals/nitro/modules/c/nitf/shared/PIXQLA.c +++ b/externals/nitro/modules/c/nitf/shared/PIXQLA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PIXQLA_description[] = { {NITF_BCS_A, 3, "Number of Associated Image Segments", "NUMAIS", }, {NITF_IF, 0, "ne ALL", "NUMAIS"}, {NITF_LOOP, 0, NULL, "NUMAIS"}, @@ -39,6 +39,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PIXQLA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PIXQLA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PLTFMA.c b/externals/nitro/modules/c/nitf/shared/PLTFMA.c index 44f0704b3..368ec9548 100644 --- a/externals/nitro/modules/c/nitf/shared/PLTFMA.c +++ b/externals/nitro/modules/c/nitf/shared/PLTFMA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PLTFMA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_A, 12, "P_NAME", "P_NAME" }, {NITF_BCS_A, 40, "P_DESCR", "P_DESCR" }, @@ -76,6 +76,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PLTFMA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PLTFMA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PRADAA.c b/externals/nitro/modules/c/nitf/shared/PRADAA.c index 460bc4bf8..6ee7d8e11 100644 --- a/externals/nitro/modules/c/nitf/shared/PRADAA.c +++ b/externals/nitro/modules/c/nitf/shared/PRADAA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD // MIL-PRF-89034, Table 9 (page 48). -static nitf_TREDescription description[] = { +static nitf_TREDescription PRADAA_description[] = { {NITF_BCS_A, 8, "DPPDB Absolute CE 90%", "PACE" }, {NITF_BCS_A, 8, "DPPDB Absolute LE 90%", "PALE" }, {NITF_BCS_A, 8, "DPPDB Support Data CE 90%", "PSDCE" }, @@ -35,6 +35,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PRADAA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PRADAA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/PRJPSB.c b/externals/nitro/modules/c/nitf/shared/PRJPSB.c index 67feda8b6..e7c187b43 100644 --- a/externals/nitro/modules/c/nitf/shared/PRJPSB.c +++ b/externals/nitro/modules/c/nitf/shared/PRJPSB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription PRJPSB_description[] = { {NITF_BCS_A, 80, "Projection Name", "PRN" }, {NITF_BCS_A, 2, "Projection Code", "PCO" }, {NITF_BCS_N, 1, "Number of Projection Parameters", "NUM_PRJ" }, @@ -36,6 +36,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(PRJPSB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(PRJPSB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/REGPTB.c b/externals/nitro/modules/c/nitf/shared/REGPTB.c index 12b456990..245d4da5e 100644 --- a/externals/nitro/modules/c/nitf/shared/REGPTB.c +++ b/externals/nitro/modules/c/nitf/shared/REGPTB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription REGPTB_description[] = { {NITF_BCS_N, 4, "Number of Registration Points to Follow", "NUMPTS" }, {NITF_LOOP, 0, NULL, "NUMPTS"}, @@ -38,6 +38,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(REGPTB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(REGPTB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RPC00B.c b/externals/nitro/modules/c/nitf/shared/RPC00B.c index 3ba2066d1..e5d09de4a 100644 --- a/externals/nitro/modules/c/nitf/shared/RPC00B.c +++ b/externals/nitro/modules/c/nitf/shared/RPC00B.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RPC00B_description[] = { {NITF_BCS_N, 1, "Success", "SUCCESS" }, {NITF_BCS_A, 7, "Error - Bias", "ERR_BIAS" }, {NITF_BCS_A, 7, "Error - Random", "ERR_RAND" }, @@ -54,6 +54,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(RPC00B, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPC00B) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RPFDES.c b/externals/nitro/modules/c/nitf/shared/RPFDES.c index 59cf0243c..51b4a5a1f 100644 --- a/externals/nitro/modules/c/nitf/shared/RPFDES.c +++ b/externals/nitro/modules/c/nitf/shared/RPFDES.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RPFDES_description[] = { {NITF_BINARY, 1, "location section length", "LOCLEN" }, {NITF_IF, 0, "> 0", "LOCLEN"}, {NITF_BINARY, 1, "component location table offset", "CLTOFF" }, @@ -42,6 +42,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(RPFDES, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPFDES) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RPFIMG.c b/externals/nitro/modules/c/nitf/shared/RPFIMG.c index 444c559af..a06ef2ba5 100644 --- a/externals/nitro/modules/c/nitf/shared/RPFIMG.c +++ b/externals/nitro/modules/c/nitf/shared/RPFIMG.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RPFIMG_description[] = { {NITF_BINARY, 1, "location section length", "LOCLEN" }, {NITF_BINARY, 1, "component location table offset", "CLTOFF" }, {NITF_BINARY, 1, "# of section location records", "SECRECS" }, @@ -40,6 +40,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(RPFIMG, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RPFIMG) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMAPA.c b/externals/nitro/modules/c/nitf/shared/RSMAPA.c index 5da870e3c..7211fbad7 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMAPA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMAPA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMAPA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, {NITF_BCS_A, 40, "Triangulation ID", "TID" }, @@ -117,6 +117,6 @@ static nitf_TREDescription description[] = { -NITF_DECLARE_SINGLE_PLUGIN(RSMAPA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMAPA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMDCA.c b/externals/nitro/modules/c/nitf/shared/RSMDCA.c index c9a8f36fc..549552083 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMDCA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMDCA.c @@ -36,7 +36,7 @@ static int count(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* error) } -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMDCA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, {NITF_BCS_A, 40, "Triangulation ID", "TID" }, @@ -139,6 +139,6 @@ static nitf_TREDescription description[] = { -NITF_DECLARE_SINGLE_PLUGIN(RSMDCA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMDCA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMECA.c b/externals/nitro/modules/c/nitf/shared/RSMECA.c index 242a0212f..6848701d3 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMECA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMECA.c @@ -58,7 +58,7 @@ static int mapped(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* error) } -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMECA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, {NITF_BCS_A, 40, "Triangulation ID", "TID" }, @@ -210,6 +210,6 @@ static nitf_TREDescription description[] = { -NITF_DECLARE_SINGLE_PLUGIN(RSMECA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMECA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMGGA.c b/externals/nitro/modules/c/nitf/shared/RSMGGA.c index 6e3c82e8a..c00450003 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMGGA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMGGA.c @@ -44,7 +44,7 @@ static int nxptsXnypts(nitf_TRE* tre, char idx[10][10], int depth, nitf_Error* e return nxpts * nypts; } -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMGGA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, @@ -104,6 +104,6 @@ static nitf_TREDescription description[] = { -NITF_DECLARE_SINGLE_PLUGIN(RSMGGA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMGGA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMGIA.c b/externals/nitro/modules/c/nitf/shared/RSMGIA.c index 50a126a08..9c4a1ffc5 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMGIA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMGIA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMGIA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, @@ -71,6 +71,6 @@ static nitf_TREDescription description[] = { -NITF_DECLARE_SINGLE_PLUGIN(RSMGIA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMGIA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMIDA.c b/externals/nitro/modules/c/nitf/shared/RSMIDA.c index cfe0e6e51..26e9e6cda 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMIDA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMIDA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMIDA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, {NITF_BCS_A, 40, "Image Sequence Identifier", "ISID" }, @@ -134,6 +134,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(RSMIDA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMIDA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMPCA.c b/externals/nitro/modules/c/nitf/shared/RSMPCA.c index 815094815..29e180d5c 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMPCA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMPCA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMPCA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, @@ -105,6 +105,6 @@ static nitf_TREDescription description[] = { }; -NITF_DECLARE_SINGLE_PLUGIN(RSMPCA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMPCA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/RSMPIA.c b/externals/nitro/modules/c/nitf/shared/RSMPIA.c index 757d6069b..cb4062b36 100644 --- a/externals/nitro/modules/c/nitf/shared/RSMPIA.c +++ b/externals/nitro/modules/c/nitf/shared/RSMPIA.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription RSMPIA_description[] = { {NITF_BCS_A, 80, "Image Identifier", "IID" }, {NITF_BCS_A, 40, "RSM Image Support Data Edition", "EDITION" }, @@ -67,6 +67,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(RSMPIA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(RSMPIA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SECTGA.c b/externals/nitro/modules/c/nitf/shared/SECTGA.c index 5f866dd54..d6bab85ee 100644 --- a/externals/nitro/modules/c/nitf/shared/SECTGA.c +++ b/externals/nitro/modules/c/nitf/shared/SECTGA.c @@ -25,13 +25,13 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SECTGA_description[] = { {NITF_BCS_A, 12, "Secondary Target ID", "SEC_ID" }, {NITF_BCS_A, 15, "Secondary Target BE No", "SEC_BE" }, {NITF_BCS_A, 1, "reserved 1", "RESVD001" }, {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SECTGA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SECTGA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SENSRA.c b/externals/nitro/modules/c/nitf/shared/SENSRA.c index e6f6e3cd6..fd3cf1324 100644 --- a/externals/nitro/modules/c/nitf/shared/SENSRA.c +++ b/externals/nitro/modules/c/nitf/shared/SENSRA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SENSRA_description[] = { {NITF_BCS_N, 8, "Ref Row", "REFROW" }, {NITF_BCS_N, 8, "Ref Col", "REFCOL" }, {NITF_BCS_A, 6, "Sensor Model", "SNSMODEL" }, @@ -53,6 +53,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SENSRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SENSRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SENSRB.c b/externals/nitro/modules/c/nitf/shared/SENSRB.c index cae78468f..8b7b63d52 100644 --- a/externals/nitro/modules/c/nitf/shared/SENSRB.c +++ b/externals/nitro/modules/c/nitf/shared/SENSRB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SENSRB_description[] = { {NITF_BCS_A, 1, "General Data", "GENERAL_DATA"}, /* 01 */ {NITF_IF, 0, "eq Y", "GENERAL_DATA"}, {NITF_BCS_A, 25, "Sensor Name", "SENSOR"}, /* 01a */ @@ -402,6 +402,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SENSRB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SENSRB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SNSPSB.c b/externals/nitro/modules/c/nitf/shared/SNSPSB.c index 8655b96b6..51565eec7 100644 --- a/externals/nitro/modules/c/nitf/shared/SNSPSB.c +++ b/externals/nitro/modules/c/nitf/shared/SNSPSB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SNSPSB_description[] = { {NITF_BCS_N, 2, "Number of sets of sensor parameters", "NUMSNS" }, {NITF_LOOP, 0, NULL, "NUMSNS"}, {NITF_BCS_N, 2, "Number of Bounding Polygons", "NUM_BP" }, @@ -86,6 +86,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SNSPSB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SNSPSB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SNSRA.c b/externals/nitro/modules/c/nitf/shared/SNSRA.c index 35e1f8e91..41a07bb50 100644 --- a/externals/nitro/modules/c/nitf/shared/SNSRA.c +++ b/externals/nitro/modules/c/nitf/shared/SNSRA.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SNSRA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_A, 20, "SENNAME", "SENNAME" }, {NITF_BCS_A, 1, "SENTYPE", "SENTYPE" }, @@ -107,6 +107,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SNSRA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SNSRA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/SOURCB.c b/externals/nitro/modules/c/nitf/shared/SOURCB.c index 7adae1ff2..efce785e8 100644 --- a/externals/nitro/modules/c/nitf/shared/SOURCB.c +++ b/externals/nitro/modules/c/nitf/shared/SOURCB.c @@ -24,7 +24,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription SOURCB_description[] = { {NITF_BCS_N, 9, "Image Segment Reciprocal Scale", "IS_SCA" }, {NITF_BCS_A, 10, "Colout Patch ID", "CPATCH" }, {NITF_BCS_N, 2, "Number of Source Descriptions", "NUM_SOUR" }, @@ -121,6 +121,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(SOURCB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(SOURCB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/STDIDC.c b/externals/nitro/modules/c/nitf/shared/STDIDC.c index f10f64922..344f627e1 100644 --- a/externals/nitro/modules/c/nitf/shared/STDIDC.c +++ b/externals/nitro/modules/c/nitf/shared/STDIDC.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription STDIDC_description[] = { {NITF_BCS_A, 14, "ACQ DATE", "ACQUISITION_DATE" }, {NITF_BCS_A, 14, "MISSION", "MISSION" }, {NITF_BCS_A, 2, "PASS", "PASS" }, @@ -47,6 +47,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(STDIDC, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STDIDC) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/STEROB.c b/externals/nitro/modules/c/nitf/shared/STEROB.c index 068dcd912..486b1dccf 100644 --- a/externals/nitro/modules/c/nitf/shared/STEROB.c +++ b/externals/nitro/modules/c/nitf/shared/STEROB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription STEROB_description[] = { {NITF_BCS_A, 60, "Standard ID", "ST_ID" }, {NITF_BCS_A, 1, "N Mates", "N_MATES" }, {NITF_BCS_A, 1, "Mate Instance", "MATE_INSTANCE" }, @@ -38,6 +38,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(STEROB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STEROB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/STREOB.c b/externals/nitro/modules/c/nitf/shared/STREOB.c index ef46e7761..704279440 100644 --- a/externals/nitro/modules/c/nitf/shared/STREOB.c +++ b/externals/nitro/modules/c/nitf/shared/STREOB.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription STREOB_description[] = { {NITF_BCS_A, 60, "Standard ID", "ST_ID" }, {NITF_BCS_A, 1, "Nunber of Stereo Mates", "N_MATES" }, {NITF_BCS_A, 1, "Mate Instance", "MATE_INSTANCE" }, @@ -38,6 +38,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(STREOB, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(STREOB) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/TRGTA.c b/externals/nitro/modules/c/nitf/shared/TRGTA.c index dfe226611..08b4855f1 100644 --- a/externals/nitro/modules/c/nitf/shared/TRGTA.c +++ b/externals/nitro/modules/c/nitf/shared/TRGTA.c @@ -26,7 +26,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription TRGTA_description[] = { {NITF_BCS_N, 4, "VERNUM", "VERNUM" }, {NITF_BCS_N, 3, "NO_VALID_TGTS", "NO_VALID_TGTS" }, {NITF_BCS_N, 3, "NO_SCENE_TGTS", "NO_SCENE_TGTS" }, @@ -88,6 +88,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(TRGTA, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(TRGTA) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/shared/USE00A.c b/externals/nitro/modules/c/nitf/shared/USE00A.c index 96e70d397..1ae9b8e39 100644 --- a/externals/nitro/modules/c/nitf/shared/USE00A.c +++ b/externals/nitro/modules/c/nitf/shared/USE00A.c @@ -25,7 +25,7 @@ NITF_CXX_GUARD -static nitf_TREDescription description[] = { +static nitf_TREDescription USE00A_description[] = { {NITF_BCS_N, 3, "Angle to North", "ANGLE_TO_NORTH" }, {NITF_BCS_A, 5, "Mean GSD ", "MEAN_GSD" }, {NITF_BCS_A, 1, "Reserved 1", "rsrvd01" }, @@ -53,6 +53,6 @@ static nitf_TREDescription description[] = { {NITF_END, 0, NULL, NULL} }; -NITF_DECLARE_SINGLE_PLUGIN(USE00A, description) +NITF_DECLARE_SINGLE_PLUGIN_SIMPLE(USE00A) NITF_CXX_ENDGUARD diff --git a/externals/nitro/modules/c/nitf/source/TREs.c b/externals/nitro/modules/c/nitf/source/TREs.c index 8ac463b98..fc32020de 100644 --- a/externals/nitro/modules/c/nitf/source/TREs.c +++ b/externals/nitro/modules/c/nitf/source/TREs.c @@ -33,15 +33,99 @@ #include "../shared/ACCHZB.c" #include "../shared/ACCPOB.c" +#include "../shared/ACCVTB.c" #include "../shared/ACFTA.c" +#include "../shared/ACFTB.c" +#include "../shared/AIMIDA.c" #include "../shared/AIMIDB.c" +#include "../shared/AIPBCA.c" +#include "../shared/ASTORA.c" +#include "../shared/BANDSA.c" +#include "../shared/BANDSB.c" +#include "../shared/BCKGDA.c" +#include "../shared/BLOCKA.c" +#include "../shared/BNDPLB.c" +#include "../shared/CCINFA.c" +#include "../shared/CLCTNA.c" +#include "../shared/CLCTNB.c" +#include "../shared/CMETAA.c" +#include "../shared/CSCCGA.c" #include "../shared/CSCRNA.c" +#include "../shared/CSDIDA.c" +#include "../shared/CSEPHA.c" +#include "../shared/CSEXRA.c" #include "../shared/CSEXRB.c" +#include "../shared/CSPROA.c" +#include "../shared/CSSFAA.c" +#include "../shared/CSSHPA.c" #include "../shared/ENGRDA.c" +#include "../shared/EXOPTA.c" +#include "../shared/EXPLTA.c" +#include "../shared/EXPLTB.c" +#include "../shared/GEOLOB.c" +#include "../shared/GEOPSB.c" +#include "../shared/GRDPSB.c" #include "../shared/HISTOA.c" +#include "../shared/ICHIPB.c" +#include "../shared/IMASDA.c" +#include "../shared/IMGDTA.c" +#include "../shared/IMRFCA.c" +#include "../shared/IOMAPA.c" +#include "../shared/J2KLRA.c" #include "../shared/JITCID.c" +#include "../shared/MAPLOB.c" +#include "../shared/MATESA.c" +#include "../shared/MENSRA.c" +#include "../shared/MENSRB.c" +#include "../shared/MPDSRA.c" +#include "../shared/MSDIRA.c" +#include "../shared/MSTGTA.c" +#include "../shared/MTIRPA.c" +#include "../shared/MTIRPB.c" +#include "../shared/NBLOCA.c" +#include "../shared/OBJCTA.c" +#include "../shared/OFFSET.c" +#include "../shared/PATCHA.c" +#include "../shared/PATCHB.c" +#include "../shared/PIAEQA.c" +#include "../shared/PIAEVA.c" +#include "../shared/PIAIMB.c" +#include "../shared/PIAIMC.c" +#include "../shared/PIAPEA.c" +#include "../shared/PIAPEB.c" +#include "../shared/PIAPRC.c" +#include "../shared/PIAPRD.c" +#include "../shared/PIATGA.c" +#include "../shared/PIATGB.c" +#include "../shared/PIXQLA.c" +#include "../shared/PLTFMA.c" +#include "../shared/PRADAA.c" +#include "../shared/PRJPSB.c" #include "../shared/PTPRAA.c" +#include "../shared/REGPTB.c" +#include "../shared/RPC00B.c" +#include "../shared/RPFDES.c" #include "../shared/RPFHDR.c" +#include "../shared/RPFIMG.c" +#include "../shared/RSMAPA.c" +#include "../shared/RSMDCA.c" +#include "../shared/RSMECA.c" +#include "../shared/RSMGGA.c" +#include "../shared/RSMGIA.c" +#include "../shared/RSMIDA.c" +#include "../shared/RSMPCA.c" +#include "../shared/RSMPIA.c" +#include "../shared/SECTGA.c" +#include "../shared/SENSRA.c" +#include "../shared/SENSRB.c" +#include "../shared/SNSPSB.c" +#include "../shared/SNSRA.c" +#include "../shared/SOURCB.c" +#include "../shared/STDIDC.c" +#include "../shared/STEROB.c" +#include "../shared/STREOB.c" +#include "../shared/TRGTA.c" +#include "../shared/USE00A.c" #include "../shared/TEST_DES.c" #include "../shared/XML_DATA_CONTENT.c" @@ -72,9 +156,9 @@ /* TRE description for user header */ static nitf_TREDescription TEST_PRELOADED_DES_description[] = { - {NITF_BCS_N, 2, "Number of data values", "COUNT" }, - {NITF_BCS_N, 3, "Start value in ramp", "START" }, - {NITF_BCS_N, 2, "Increment between values in ramp", "INCREMENT" }, + {NITF_BCS_N, 2, "Number of data values", "COUNT" }, + {NITF_BCS_N, 3, "Start value in ramp", "START" }, + {NITF_BCS_N, 2, "Increment between values in ramp", "INCREMENT" }, {NITF_END, 0, NULL, NULL} }; static nitf_TREDescriptionInfo TEST_PRELOADED_DES_descriptions[] = { @@ -111,17 +195,101 @@ nitf_TREPreloaded defaultPreloadedTREs[] = { // Not preloading any TREs right now: with the existing system, // a TRE can be removed by deleting the DLL/SO. If that same TRE // were preloaded, there would be no way to get rid of it. - NITF_preload_TRE(ACCHZB), - NITF_preload_TRE(ACCPOB), - NITF_preload_TRE(ACFTA), - NITF_preload_TRE(AIMIDB), - NITF_preload_TRE(CSCRNA), - NITF_preload_TRE(CSEXRB), - NITF_preload_TRE(ENGRDA), - NITF_preload_TRE(HISTOA), - NITF_preload_TRE(JITCID), - NITF_preload_TRE(PTPRAA), - NITF_preload_TRE(RPFHDR), + NITF_preload_TRE(ACCHZB), + NITF_preload_TRE(ACCPOB), + NITF_preload_TRE(ACCVTB), + NITF_preload_TRE(ACFTA), + NITF_preload_TRE(ACFTB), + NITF_preload_TRE(AIMIDA), + NITF_preload_TRE(AIMIDB), + NITF_preload_TRE(AIPBCA), + NITF_preload_TRE(ASTORA), + NITF_preload_TRE(BANDSA), + NITF_preload_TRE(BANDSB), + NITF_preload_TRE(BCKGDA), + NITF_preload_TRE(BLOCKA), + NITF_preload_TRE(BNDPLB), + NITF_preload_TRE(CCINFA), + NITF_preload_TRE(CLCTNA), + NITF_preload_TRE(CLCTNB), + NITF_preload_TRE(CMETAA), + NITF_preload_TRE(CSCCGA), + NITF_preload_TRE(CSCRNA), + NITF_preload_TRE(CSDIDA), + NITF_preload_TRE(CSEPHA), + NITF_preload_TRE(CSEXRA), + NITF_preload_TRE(CSEXRB), + NITF_preload_TRE(CSPROA), + NITF_preload_TRE(CSSFAA), + NITF_preload_TRE(CSSHPA), + NITF_preload_TRE(ENGRDA), + NITF_preload_TRE(EXOPTA), + NITF_preload_TRE(EXPLTA), + NITF_preload_TRE(EXPLTB), + NITF_preload_TRE(GEOLOB), + NITF_preload_TRE(GEOPSB), + NITF_preload_TRE(GRDPSB), + NITF_preload_TRE(HISTOA), + NITF_preload_TRE(ICHIPB), + NITF_preload_TRE(IMASDA), + NITF_preload_TRE(IMGDTA), + NITF_preload_TRE(IMRFCA), + NITF_preload_TRE(IOMAPA), + NITF_preload_TRE(J2KLRA), + NITF_preload_TRE(JITCID), + NITF_preload_TRE(MAPLOB), + NITF_preload_TRE(MATESA), + NITF_preload_TRE(MENSRA), + NITF_preload_TRE(MENSRB), + NITF_preload_TRE(MPDSRA), + NITF_preload_TRE(MSDIRA), + NITF_preload_TRE(MSTGTA), + NITF_preload_TRE(MTIRPA), + NITF_preload_TRE(MTIRPB), + NITF_preload_TRE(NBLOCA), + NITF_preload_TRE(OBJCTA), + NITF_preload_TRE(OFFSET), + NITF_preload_TRE(PATCHA), + NITF_preload_TRE(PATCHB), + NITF_preload_TRE(PIAEQA), + NITF_preload_TRE(PIAEVA), + NITF_preload_TRE(PIAIMB), + NITF_preload_TRE(PIAIMC), + NITF_preload_TRE(PIAPEA), + NITF_preload_TRE(PIAPEB), + NITF_preload_TRE(PIAPRC), + NITF_preload_TRE(PIAPRD), + NITF_preload_TRE(PIATGA), + NITF_preload_TRE(PIATGB), + NITF_preload_TRE(PIXQLA), + NITF_preload_TRE(PLTFMA), + NITF_preload_TRE(PRADAA), + NITF_preload_TRE(PRJPSB), + NITF_preload_TRE(PTPRAA), + NITF_preload_TRE(REGPTB), + NITF_preload_TRE(RPC00B), + NITF_preload_TRE(RPFDES), + NITF_preload_TRE(RPFHDR), + NITF_preload_TRE(RPFIMG), + NITF_preload_TRE(RSMAPA), + NITF_preload_TRE(RSMDCA), + NITF_preload_TRE(RSMECA), + NITF_preload_TRE(RSMGGA), + NITF_preload_TRE(RSMGIA), + NITF_preload_TRE(RSMIDA), + NITF_preload_TRE(RSMPCA), + NITF_preload_TRE(RSMPIA), + NITF_preload_TRE(SECTGA), + NITF_preload_TRE(SENSRA), + NITF_preload_TRE(SENSRB), + NITF_preload_TRE(SNSPSB), + NITF_preload_TRE(SNSRA), + NITF_preload_TRE(SOURCB), + NITF_preload_TRE(STDIDC), + NITF_preload_TRE(STEROB), + NITF_preload_TRE(STREOB), + NITF_preload_TRE(TRGTA), + NITF_preload_TRE(USE00A), NITF_preload_TRE(XML_DATA_CONTENT), //NITF_preload_TRE(TEST_DES), // This should ALWAYS come from the DLL/SO