From 974069cf8f296a55f35e2affeec3965a79525415 Mon Sep 17 00:00:00 2001
From: Dan Smith <dan.smith@maxar.com>
Date: Tue, 31 Aug 2021 12:56:11 -0400
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit a18a30e34d930d1d5b825d8b780d7244dbc120f0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Aug 31 12:21:30 2021 -0400

    latest from "nitro"

commit 0527a629b781bc0531c4b5c20456617317f272a5
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Aug 31 12:20:12 2021 -0400

    latest from coda-oss

commit ee48c047678cad511d7a84f6a125f11deba88014
Merge: 1096f4fd5 6cff53db9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Aug 31 12:19:29 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 1096f4fd5e94a1dbbf52e5f368681d163d76ca6e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 14:17:33 2021 -0400

    latest from nitro and coda-oss

commit 73e77a8b4c84b0f6ffc11a524bf9c9e46e6e8172
Merge: 99ae196d3 ff3219eb1
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 14:01:46 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 99ae196d3861fb08a0785fe233679e4b61970186
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 12:17:41 2021 -0400

    account for NITRO changes

commit c57cd954272f55da042262f5c8d5e88ed15f72ce
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 11:55:35 2021 -0400

    latest from "nitro"

commit 9cd3c090116420237c9a948dbc2652d9eb044343
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 11:53:00 2021 -0400

    latest from coda-oss

commit 4c2b6526fb7f05bbeb9d7ace83254dcb0d991e50
Merge: 76a8924ef c13678637
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 25 11:25:15 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 76a8924efc427079a8593e6ccfa8242bb1e0defe
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Aug 16 09:25:42 2021 -0400

    mem::ScopedArray<T> is now the same as std::unique_ptr<T[]>

commit 76a7a1768bfe1115d705085c3a9c4b8aa39c9e53
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Aug 16 09:06:07 2021 -0400

    latest from coda-oss

commit bf3a4183d98778292b522b108af655b870f81f7c
Merge: 1b96c7c82 242b834f6
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Aug 16 09:01:51 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 1b96c7c8266b8af0ab1879a7bd52598d4e04d4bf
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 11 11:10:19 2021 -0400

    latest from "nitro"

commit 7c3ab64208cfffa33eaa8c35f5f6296e542a23a8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 11 11:05:52 2021 -0400

    latest from coda-oss

commit 06fae55d680fdac68314a7f7f3581babd8235911
Merge: da2932b21 1334638dd
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 11 11:00:38 2021 -0400

    Merge branch 'master' into develop/update_externals

commit da2932b21a7c2796aee659b598813643bbb7b72a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 4 10:30:13 2021 -0400

    latest from "nitro"

commit de9ae8cc8df0e4fc09ad98f5a4c3845a8ee66e35
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 4 10:15:36 2021 -0400

    latest from coda-oss

commit 1b15d837462f2fab03a77e449602a55076a1358e
Merge: e219ad8c0 6fa3d44d9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Aug 4 10:13:22 2021 -0400

    Merge branch 'master' into develop/update_externals

commit e219ad8c0282ad9000cdf071089b979335ea79b6
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jun 23 10:54:34 2021 -0400

    latest from coda-oss

commit d9fd3dd57e54011053412c3109095ea7d3dbc0a7
Merge: 3681b8586 67830a063
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jun 23 10:51:23 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 3681b85865a306eebefe48584e00e1c4ca53f825
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 17 09:49:18 2021 -0400

    getCornersAsLatLons should be w/o "const"

commit 5ce71b5def4bea12737d3dcb6f8b3d8bcddb7868
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 17 09:39:41 2021 -0400

    latest from "nitro"

commit 86feacfc0317f86db863a1bc40250cf0acc3d6e9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 17 09:37:44 2021 -0400

    latest from coda-oss

commit 0103074f0d1db84c55c01541571029f75feebfe9
Merge: f4c89c4e9 8ab030569
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 17 09:24:19 2021 -0400

    Merge branch 'master' into develop/update_externals

commit f4c89c4e950246ef7dc6ec307cc18104253c911a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 10 16:29:14 2021 -0400

    latest from NITRO

commit aef4a229e7a3f7c977a2340aee6a80ab7856b098
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu Jun 10 16:26:48 2021 -0400

    latest from coda-oss

commit 10015fe2ab6a8f5a55a1d65583b393a471b3226c
Merge: 5a8c6a58b e708b980c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu May 27 15:19:30 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 5a8c6a58b14a4a29bbfe685727f3bee45ee3c1c4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Thu May 27 13:38:20 2021 -0400

    latest from nitro and coda-oss

commit 4b89b4f9c5f15dfe60dc1ecea7b2ccec15848f61
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed May 26 10:07:40 2021 -0400

    tweaks for VS2019 16.10

commit 9c998810bef6a3ca96e1aba25269101a4f5f6032
Merge: cc2d0548f 9390b614b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 24 16:01:09 2021 -0400

    Merge branch 'master' into develop/update_externals

commit cc2d0548f00a61fd27235d309504b1817dac5889
Merge: dfb69caea 47301187b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 24 15:17:39 2021 -0400

    Merge branch 'master' into develop/update_externals

commit dfb69caeae5cc9aefb710673d11e6bf62e675734
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 24 14:34:58 2021 -0400

    changes from coda-oss to reduce code-analysis diagnostics

commit 433aa81ca77f566c5e8ec61e30ab734e8244308f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed May 19 16:03:14 2021 -0400

    reduce use of .c_str() in "nitro"

commit 6a294c9bb7a6d0e3b6749dace7304371dbe1824b
Merge: df166d5a2 8e10afb11
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed May 19 16:01:45 2021 -0400

    Merge branch 'master' into develop/update_externals

commit df166d5a2452aabb958ef5773d21097186a01a0d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 17 11:10:13 2021 -0400

    latest from "nitro" and "coda-oss"

commit 0314b791e395dcce4f9e15b8a5b8087f0bca3b86
Merge: ef2d1fee0 50bbbb573
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 17 11:05:57 2021 -0400

    Merge branch 'master' into develop/update_externals

commit ef2d1fee0e8c0cba0cfe9e2b372431cc928e2599
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue May 11 10:41:21 2021 -0400

    build NITRO @ /W4

commit a4f624b985335b3633a5804e14b9819c293cf3a0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat May 8 12:38:51 2021 -0400

    be sure NITRO validation changes don't break SIX unittests

commit 2bb3a4e4582046435e42cb53462598b824fc2685
Merge: 0591d37c0 76c1dc1dc
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat May 8 12:34:01 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 0591d37c0f46402a7b467f8d04c292426cb9d089
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue May 4 13:27:14 2021 -0400

    latest from coda-oss to get rid of more compiler warnings/code-analysis diagnostics

commit 5ace9f9bd05e17ba786a322574e4fbe53225c5f0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 3 13:58:24 2021 -0400

    explicitly list SegmentMemorySource() overloads

commit f273b6d036a25fdf6899af195069ae88bedc1218
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 3 13:13:08 2021 -0400

    build w/o errors when nitf-c++ is a DLL

commit 9faad061720737c0abc35b33192280a3243740bc
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 3 11:45:13 2021 -0400

    latest from "nitro" to support nitf-c++ as a DLL/shared-library

commit f20557ace1f491f6597cf8f03ce873b0c494103e
Merge: 5df916362 27b8f6aa5
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon May 3 11:31:16 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 5df916362cec21608631c5d9ac0444ca1b6c339b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Apr 26 12:09:53 2021 -0400

    updates from "nitro"

commit dc070a143163f920e11f66768fded2876a1277af
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Apr 26 12:07:44 2021 -0400

    latest from coda-oss

commit 733a255827f4c031ac654959189cd65358cecafb
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 20 10:01:43 2021 -0400

    latest from nitro

commit 0b2b871e26044cc9d4b3da4edd0df6fedc1145f9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 20 09:55:06 2021 -0400

    latest from coda-oss and nitro

commit fc46c9fdec6b0f432e04d3507ed322e0c9a114d6
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Mon Apr 19 09:08:27 2021 -0400

    lost sys/Conf.h #include

commit 09ffddbee6c37573a96c7c81def4d673f9da0acf
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Apr 19 08:36:41 2021 -0400

    updates from "nitro"

commit 24e1ee592c1979e0d91b92b715377356f03cedff
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Apr 17 16:49:21 2021 -0400

    latest from coda-oss

commit 8e1527568ce9f6e6aeaeebea24eec59d7b627932
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Apr 17 09:35:04 2021 -0400

    more code-analysis diagnostics fixes from coda-oss

commit 445cf74cd1348c5c9003bfbd9ef83e37659b4adf
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Apr 14 16:29:00 2021 -0400

    latest from coda-oss to reduce compiler warnings

commit e70e2572e59c72a4520a1aa65cff4f8dd9333bc3
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Apr 14 12:54:49 2021 -0400

    coda-oss updates to reduce compiler warnings/code-analysis diagnostics

commit d30e0ab68a96fb56df37c228afd317e1c68f4a2e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Apr 14 09:19:28 2021 -0400

    latest from coda-oss

commit 74491f15ab390f4a0372e14de3008bf3d850aece
Merge: 37b4a362b de6c5fae4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Apr 14 09:17:09 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 37b4a362b9577fc9c2b71027cf1f33f91676179e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 13 17:39:49 2021 -0400

    another update to coda-oss to get rid of code-analysis diagnostics

commit 582f71ac9689ee028f99523cce4772c20102a709
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 13 09:02:51 2021 -0400

    updates from coda-oss to remove compiler warnings

commit 89898de7acf89ae37979a00fbb9d7b4ac5f395ec
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 6 11:38:10 2021 -0400

    tweaks to python wrappers from coda-oss

commit 6c8bb000dcddbc7a8327c9c26da1a18cbadc2f5d
Merge: c77366127 1a7f2f328
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Apr 6 11:34:07 2021 -0400

    Merge branch 'master' into develop/update_externals

commit c77366127448c8d9ca8c1a12d79df31707c8db19
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Apr 5 10:26:53 2021 -0400

    latest from "coda-oss" and "nitro"

commit 7cd31db3f438ae1ccf660a1847f02c1eff81c58e
Merge: 0319e7076 4ea37a20f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Apr 3 10:45:52 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 0319e7076ced45d3febf60cf3bc22d62a3ca3803
Merge: 1dfc03417 788e7846d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 18:17:32 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 1dfc03417c3b2c52973a8c18c38ece0ecf763910
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 17:21:06 2021 -0400

    forgot to add new "coda_oss" directory

commit 78ec6f69a6f08f564fd98ab678c501e34117200e
Merge: f105c98ab a5910ffd2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 17:00:53 2021 -0400

    Merge branch 'master' into develop/update_externals

commit f105c98ab9a54dc87efc7b266662b65c3e176007
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 16:54:27 2021 -0400

    add back coda_oss;;filesystem::path

commit f819681ee8fce3ca867ab037cd2cd7575d002ee9
Merge: ab1348f5e 664d2c219
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 14:03:46 2021 -0400

    Merge branch 'master' into develop/update_externals

commit ab1348f5e77b94f1a980c4b468b3bc4f89561625
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 13:27:42 2021 -0400

    account for removed coda-oss overloads

commit 1005fb00d4a1c8b2fa30f51c82798e4992f9e223
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 11:50:01 2021 -0400

    build using C++17 features

commit 899e6158a65262649190c0de909ea9c620176831
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 27 11:21:10 2021 -0400

    sys/Filesystem.h -> std/filesystem

commit 3d28513e4c9cd307891c65c43113616878eeefe8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 15:56:56 2021 -0400

    WAF dependencies for "scene"

commit a22f195284c320b58c82272998d2d3d32715eb50
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 15:46:25 2021 -0400

    fix coda-oss unittest dependencies

commit a9d7356085e0d6c136f00711cf5828cc4fb7bade
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 15:27:35 2021 -0400

    latest from coda-oss

commit b00fab77e92c86b3b101536730870c46600cf578
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 12:38:50 2021 -0400

    updates from coda-oss and nitro

commit dfff3e6dec52734e23f075a65b0a8ed3569f58a0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 12:01:36 2021 -0400

    more coda-oss changes

commit 30afeeac677873c24c72b53796a8768525786f9a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 10:27:21 2021 -0400

    use new coda-oss "std" headers

commit fd1485f17608bf0fbfa6b5d9d567ec92298c11af
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 10:14:30 2021 -0400

    be sure coda-oss "std" files are copied

commit c1f2b328b7b8bc7dcd3dcbd41fd851dadb3a8a77
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 10:02:23 2021 -0400

    update coda-oss and nitro

commit eeba5b8f0641d679eb895b0141aed17a52918653
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Mar 24 08:08:18 2021 -0400

    CODA_OSS_AUGMENT_std_namespace got clobbered again

commit 77276c14a479d828b67b7df7d8ea96201a141449
Merge: 77b0b6545 7c1caf136
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 13:43:24 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 77b0b6545a3dfd2cd0a8457a65a5d2030243ed7b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 12:45:37 2021 -0400

    remove CA diagnostics from coda-oss

commit cdb74ed4757559d701140a41d7d4c216c339fea6
Merge: 5aa2efba1 0cee4292b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 11:47:37 2021 -0400

    Merge branch 'master' into develop/update_externals

commit 5aa2efba19373c06fd94501d2f83a687f71951b7
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 09:34:04 2021 -0400

    latest from "master" at nitro

commit 4db1a4be74299cece5953c6c3299203a26fd9cb8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 09:28:46 2021 -0400

    latest from "master" on coda-oss

commit cc369cc01fb09490707ebb64a72edc9d45dbe08c
Merge: a22422ae0 9be2a2af8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 22 09:26:16 2021 -0400

    Merge branch 'master' into develop/update_externals

commit a22422ae0eed2d7b393caad717b3a17592ee27e1
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Mar 16 18:50:11 2021 -0400

    latest from coda-oss

commit a0206cf1812822e6e8aeb2982c81075f171fa608
Merge: 2d5f38dd1 64130a79c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 10:32:12 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 2d5f38dd15beb538a325b0e7068704943db36eb9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 09:05:30 2021 -0500

    missing "build" files

commit 9825b7da00cc69652360aeb53bc2a7be199677b6
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 09:03:30 2021 -0500

    missing .cmake files

commit f84a172af6e75e242de665a4d648c01fbae0597f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 08:42:59 2021 -0500

    version number is in too many places ...

commit b69e63ab7e39b962e6ace387bc3d7cc311234792
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 08:40:46 2021 -0500

    finish rename

commit 5283b310f891b06300ddb2580f666bceffd4767b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Mar 8 08:35:46 2021 -0500

    remove version numbers (for now); we've went a very long time w/o them

commit abe6a561d8a0e4de214bb7ddaffcf98ea1cd3f68
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 6 17:13:46 2021 -0500

    update CMS to 3.0.3.3 (https://github.com/ngageoint/six-library/issues/433)

commit f4e67deff2e978687ab41daf65c7c1ca221af7b1
Merge: 2b4e00a9e fcd89c652
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 6 16:54:07 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 2b4e00a9e12e820c356c99e43ec80700c104601f
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Sat Mar 6 15:49:05 2021 -0500

    Gsl_.h got lost ... ?

commit 25cd85e1d090a0f33ba2b683541bdc4aff258bb7
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Sat Mar 6 15:41:11 2021 -0500

    restore "build" and "cmake"

commit a675370deb50da8f7247159e9024bff9ac383e79
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 6 15:30:56 2021 -0500

    add a version number to externals/nitro

commit cb99d69acfd296878fbacde04926aed36c8e42eb
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 6 15:23:19 2021 -0500

    add a version number to externals/coda-oss

commit 9f26eedc7057adf47d925837b8d2d9a927b33147
Merge: 5dcd930c6 cf6f419e9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Mar 6 14:56:43 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 5dcd930c60f9c9c461db66d1d3f3eb2156494839
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Mar 2 12:35:28 2021 -0500

    latest from "nitro"

commit 07ba711ffdeb4a3b7c465c6c4611607147e9e0fd
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Mar 2 12:32:36 2021 -0500

    latest from coda_oss

commit af2417e3e73596bf749236122882e31650dfcdb8
Merge: 241b4f532 6b8265118
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Mar 2 12:26:07 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 241b4f532c77b074a2c4e593bf7ba98dc8b9504a
Merge: 6dfeb8599 e662ccae4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 23 16:22:58 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 6dfeb8599b9dfc6803e87401445d9413dce55395
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 23 16:22:25 2021 -0500

    SWIG doesn't like "final"

commit f64bd7191b6426b181b654b81488c33745147b31
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 23 15:17:06 2021 -0500

    SWIG doesn't like "final"

commit 9bc5b4c96b4b29ad86da636735b16029ca154e6f
Merge: 93d681486 8c469b58e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 23 15:15:32 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 93d681486e8cb2fd5fa2b9a4010ed26becfa8509
Merge: 805b4fd0c e846b9490
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 15 15:04:16 2021 -0500

    Merge branch 'develop/update_externals' of github.com:ngageoint/six-library into develop/update_externals

commit e846b949095117a7d9c156277db65d00d921a9bb
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 15 15:02:32 2021 -0500

    Update .gitignore from "nitro"

commit 0c8be8ebc0ad2acd6c796594328d4be90285d71c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 15 14:57:56 2021 -0500

    latest coda-oss changes

commit 67b566658adc2d024615049e8604b54a5de8d0f8
Merge: 5d113a48b 1327e071a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 15 14:52:16 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 5d113a48b8b5966010d0f7ff73b529208162c770
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Wed Feb 10 08:51:32 2021 -0500

    build with older compilers

commit 969cd6f6ea1ce23cdf5349f95d9b5bfc32f18926
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 18:29:07 2021 -0500

    std::shared_ptr<> doesn't have [] versions, only std::unique_ptr

commit 00b6e23eee97a203b5fe87cda1c50f6760f7c5e5
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 17:50:12 2021 -0500

    new TREs from "nitro"

commit c2a990976efd65a857f1e67a46ab1de40314b884
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 17:40:02 2021 -0500

    old C++11 compilers don't like template<template>

commit 98df1ed3947898603f9203fa464824721154affd
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 16:06:31 2021 -0500

    "nitro" changes to build with C90 instead of C99

commit 9ef79c0a47120cf680ca3c9a3bbbd0f60da8bbfe
Merge: 92ab24a96 5febd8eae
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 14:19:43 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 92ab24a9656e2b02c1ab9445fb97149736fb292d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 13:52:55 2021 -0500

    one more change from coda-oss

commit ee7b56324d5c6c49344ed191f7ec296ab43a773c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 13:47:25 2021 -0500

    latest from coda-oss

commit a181f348022d7856f56873eda0fbf5d7e3bfcabb
Merge: f616a8e62 f7a1c034e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 9 13:33:16 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 805b4fd0c75f3a79bd38bd5755c771092d60ba7b
Merge: f616a8e62 4b30e4a09
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Feb 2 13:35:08 2021 -0500

    Merge branch 'master' into develop/update_externals

commit f616a8e623c2784dc46c5e672525a3269538a134
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 1 14:35:41 2021 -0500

    latest from "coda-oss" and "nitro"

commit 42c63d0a153a27c5e5fd073c5c07a4e4036201c2
Merge: 6ba97c649 1f671bb17
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Feb 1 11:41:32 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 6ba97c6499be41a1f7d8e3bebaba0f06520a583d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 30 16:10:31 2021 -0500

    more place where an explicit std::filesystem::path::string() call is needed

commit 96918daf007397605a14914ae2645d98e0e0fec2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 30 15:58:51 2021 -0500

    std::filesystem::path doesn't implicitly convert to std::string

commit f13785c7f22c21945cbcc82f04d0a2183b473a22
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 30 15:58:31 2021 -0500

    latest from coda-oss

commit 6a3859f9c2df84d19664b806182117d063a7429e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 27 15:18:04 2021 -0500

    latest from coda-oss

commit 9dd7e36a96d4ea40ebba120c901904bafc3d046d
Merge: bc1744e03 d22cdb99a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 27 15:16:51 2021 -0500

    Merge branch 'master' into develop/update_externals

commit bc1744e03517f4fd41a90e46b845dc818a529343
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 27 13:14:37 2021 -0500

    adjust to API changes in coda-oss/xml.lite

commit f204751432f3ab6a2eb60f9204aa3a1db3b8f76e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 27 12:57:45 2021 -0500

    latest from nitro::master

commit 4b403052198a2bf775ae99142114009a45add25f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 27 12:54:36 2021 -0500

    latest from coda-oss:master

commit f99597a1c72ab6838d139ca873bceac6251afb88
Merge: 0ecff9559 5d81778ca
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 26 08:43:34 2021 -0500

    Merge branch 'master' into develop/update_externals

commit 0ecff955987475619e5756b30bbe1e38add907fa
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 17:59:47 2021 -0500

    remove files that shouldn't have been committed

commit 671a89a17a8c7e818e51f0b8ac260d3cbd50b35f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 17:28:27 2021 -0500

    trigger build on GitHub

commit 460a96b3819c150608ca6e28cf51234b53c7299e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 17:14:26 2021 -0500

    didn't want this change

commit 0ec8633e6f1f16384e08fb0f54fc463c05c5a0a7
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 17:11:15 2021 -0500

    get #includes right for PCH

commit 824284722ce0a6b80cdbc6c76d9414032b27da45
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 16:55:58 2021 -0500

    gsl::span -> std::span

commit 70a3e7282bc4359f6edbc2df52c77e11df523b1b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 16:50:53 2021 -0500

    these are the correct files from "master"

commit b856b5451289a0ad6bab254dd2a2d6f14aee571d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 16:44:25 2021 -0500

    latest from coda-oss and nitro

commit fa0a138472ae143518bad1eb9d608152d32dbe22
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 16:33:06 2021 -0500

    Revert "std::span -> gsl::span"

    This reverts commit c10f2332c3650969a770c71ee830569911b9d13a.

commit f897082bd98771c278a77a14561be9e194c3878e
Merge: c10f2332c 812235491
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 19 16:32:43 2021 -0500

    Merge branch 'master' into develop/update_externals

commit c10f2332c3650969a770c71ee830569911b9d13a
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Sat Jan 16 15:08:25 2021 -0500

    std::span -> gsl::span

commit 9e218034c4ecdac44392473ee8f385a25a56f3c5
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 16 14:49:00 2021 -0500

    need to redo C++17 support

commit e21d4fcf730005f605df2d345f62e4f2399a14ca
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 16 14:48:25 2021 -0500

    paths are wrong in "externals"

commit 1083ac1a6cc8879d2b1c9949602321197cec4ecc
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 16 13:52:32 2021 -0500

    latest from "nitro"

commit 6fca2584d08b2d03374450a60d64c7086c23d568
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 16 12:20:13 2021 -0500

    lates from coda-oss/main

commit 1073b397a60a3a5357c5b433409dd6447b773273
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 16 11:41:11 2021 -0500

    add back "java" and "mex"

commit 6de2fa0d43d9d40078b0c268ac3fdeb78ae7aa39
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 10:22:13 2021 -0500

    merge brought back a deleted #include

commit 4e23991f609f2ec430a57539f80c27561abb28c8
Merge: ebe95509a 436986f87
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 10:18:55 2021 -0500

    Merge branch 'develop/update_externals' into main

commit ebe95509a01652e16d9fc9ac8869834bd2cf60a2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 10:18:01 2021 -0500

    slam in externals as merging creates too many conflicts

commit 436986f87f612e10ada1cce884a4519daa022a5d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 09:40:28 2021 -0500

    Revert "Revert "remove "nitro" files not needed in externals/nitro""

    This reverts commit e69391bfee6b5e7cd481fc83856f7eee95e83929.

commit e69391bfee6b5e7cd481fc83856f7eee95e83929
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 09:39:25 2021 -0500

    Revert "remove "nitro" files not needed in externals/nitro"

    This reverts commit da30b960bb2a2af6c4580c49cae6740588703653.

commit dd710d55110cdd7b4bd8a17b25784e25ac93c98d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 08:52:28 2021 -0500

    paths are wrong in "externals"

commit da30b960bb2a2af6c4580c49cae6740588703653
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 08:27:21 2021 -0500

    remove "nitro" files not needed in externals/nitro

commit 120ee00fad22e0d6713184eb8f6660d97b76b721
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Jan 13 08:25:11 2021 -0500

    fix missing #include file

commit fa1990597c9e08a30e110e5710ec0177d6aabfdf
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:55:17 2021 -0500

    need to redo C++17

commit 1bd0cb3a8df08c6304bea6ff3a187a2847ad37df
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:50:53 2021 -0500

    std::span removed from "nitro"

commit 4e6a7528b5888b965522f5e80d7279a36206aee8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:30:47 2021 -0500

    latest from nitro/main

commit 99a0a01cb852152021c61696fb9b83bdab425004
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:28:13 2021 -0500

    adjust coda-oss for our usage

commit 65026c2702081ae9cd59f676a30934564148983b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:26:59 2021 -0500

    latest from coda-oss/main

commit e6a58a2be5b66ba52b7a3747e7325acaa84276a9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Jan 12 17:24:02 2021 -0500

    slam in "main"

commit 92d5bb5ca0afce00012f8892494ef41516dc4df7
Merge: 7b8ca7066 5e5870f6b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 18:17:21 2021 -0500

    Merge branch 'develop/update_externals' of github.com:ngageoint/six-library into develop/update_externals

commit 7b8ca7066eaea523f5f57c61648e2d6093d5b454
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 18:17:11 2021 -0500

    remove externals/nitro/docs

commit 5e5870f6b9b1d38596e6be22ab89e07def076e68
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 18:05:56 2021 -0500

    paths are wrong when in "externals"

commit d9a5c2ff8923a322760393632391c50ed793510b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 17:42:08 2021 -0500

    more changes from nitro/modules/c++

commit 7aba3b8d9a1add0317b14de33b7717a8565a0b39
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Mon Jan 11 17:19:54 2021 -0500

    fix IOStreamWriter ctor

commit 84db123c433ef5d2ade3ad712369e23c8af8dbe8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 17:13:14 2021 -0500

    more changes from nitro/modules/c++

commit a6880924fe205acb4faa8ca7943cf0c84d3d59e9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 16:48:00 2021 -0500

    fix build error on Linux

commit 7a9b240ec9a313c8eb699c81dbc2742bb88fb8b4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 15:10:45 2021 -0500

    several changes from nitro/c++ ... hoping this builds.

commit a398eefa2e2ce746becee4d72dbd7c8add57c8be
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 14:48:32 2021 -0500

    VCXPROJ files from nitro

commit b3c1dbd794849177d6416a34379987996d4e019e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 14:26:17 2021 -0500

    update other nitro top-level files ... everything except modules/c++

commit 8fe3028cc3b051075b760fdd95b2562b7ec9734b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 13:48:24 2021 -0500

    update "c", "java", "mex", and "python" directories -- but not "c++"

commit e82f28cd40d9e4e3029085b23048ba6c4d9c7a29
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 13:31:22 2021 -0500

    update externals/nitro/docs

commit 89522fe0f8200111a6ea860927903f38a9021727
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 13:19:38 2021 -0500

    Revert "latest from nitro/master"

    This reverts commit e89da71da0a7f494ee6e79a92f3828d8079c1c4d.

commit 3adb502a17a1bda89372b235e18388197a9eaf4f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 13:19:24 2021 -0500

    ignore build/ directory

commit e89da71da0a7f494ee6e79a92f3828d8079c1c4d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 12:14:31 2021 -0500

    latest from nitro/master

commit db45e1e2f214df8ab417ddde0875593f0bba537b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Jan 11 09:11:16 2021 -0500

    Revert "latest from "nitro""

    This reverts commit 0b99300f7c181eb073a86239444d30bc0acf7fa4.

commit 0b99300f7c181eb073a86239444d30bc0acf7fa4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 9 18:02:30 2021 -0500

    latest from "nitro"

commit ae630e65c608257650c70735d5062db7e5e2dcc2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 9 17:33:00 2021 -0500

    update externals/nitro/docs

commit f283be39d553aafad0f3132e2277038eaa4b515c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Jan 9 17:27:31 2021 -0500

    update coda-oss with latest from https://github.com/mdaus/coda-oss

commit 825a6674dba619591e343c0ecd9672703b69e3f5
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Wed Dec 30 13:49:02 2020 -0500

    latest from coda-oss and nitro (#391)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

    * latest from "nitro"

    * std::endian

    * latest from "nitro"

    * latest from "nitro" and "coda-oss"

    * latest from coda-oss

    * lost toString<nullptr>()

    * latest from coda-oss/main

    * want "std" augmented in this repo

    * partial update from coda-oss/main

    * latest from coda-oss/main

commit 21e2b675ffd4290149bc867024ded6d008e4fd1a
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Dec 29 17:32:49 2020 -0500

    latest from coda-oss (#390)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

    * latest from "nitro"

    * std::endian

    * latest from "nitro"

    * latest from "nitro" and "coda-oss"

    * latest from coda-oss

    * lost toString<nullptr>()

    * latest from coda-oss/main

    * want "std" augmented in this repo

commit 433e81909997ccc83515b7b8551d82b9e09f1029
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Dec 22 09:38:57 2020 -0500

    reduce use of toString() (#389)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use "externals" from top-level "install"

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * build with simplified "externals" scheme

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * fix compiler errors from previous merge; mostly #include <thread>

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * latest from "coda-oss"

    * use filesystem::path and std::endian

    * more filesystem from coda-oss

    * less use of sys::

    * NULL -> nullptr

    * use .data() rather than &d[0]

    * mem::BufferView -> std::span

    * const std::span<>& doesn't make much sense

    * need make_span() overload for pointer+size

    * latest from "nitro"

    * std::endian

    * coda-oss now gives us std::endian

    * sys::Filesystem -> std::filesystem

    * don't need to explicitly call fs::path::string() in most cases

    * sys::Filesystem -> std::filesystem

    * fix build errors when using C++17

    * simplify access to some ImageSubheader values

    * newReadControl() returns a std::unique_ptr<> rather than a raw pointer

    * a singleton is much easier in C++11

    * don't need to do manual locking in C++11

    * use a template and some macros to dramatically simplify Enums

    * adjust macros for GCC, provide operators for SWIG

    * got the map entries wrong

    * make getIndices() a bit more robust

    * store a std::unique_ptr<> instead of a raw poniter

    * throw exceptions in getIndices() rather than assuming

    * use Enum<T>.toString() where possible rather than duplicating code

    * remove duplicate code converting from a string to Enum<T>

    * don't explicilty check for "SIDD" as that's already part of getDataType()

    * use std::string instead of char[]

    * reduce use of "delete[]"

    * less use of "SICD" and "SIDD", use six::DataType instead

    * simplify Region buffer management

    * reduce some explicit use of std::shared_ptr<> with std::make_shared and/or auto

    * more reduction in explicit use of std::shared_ptr

    * latest from "nitro"

    * simplify use of six::Region

    * reduce use of explicit .toString()

    * further reduction in explicit use of toString()

    * template specialiaton can't be inline with G++

    * simplify cphd enum creation

    * reduce use of toString() with setAttribute()

    * latest from "nitro" and "coda-oss"

    * don't need catch(excep::Exception) ex.toString() as std::exception::what() now does the same thing

    * really only have two calls to setAttribute(): std::string and size_t

    * use macros to generate SIDD Enums

    * add operator<< for Enum<T> to avoid some explicit .toString() calls

    * add operator==(std::string) overload to redue need for .toString()

    * add operator<<() to redue need for .toString()

    * don't implmeent a bunch of six::toString() routines; they sholdn't be called anymore

    * further reduction in use of toString()

    * eliminate six::toString() template; just provide a few overloads instead

    * createSixString() which calls six::toString(t) instead of t.toString()

    * createSixString() overload with URI parameter

    * allow different strings (e.g., "1" and "+1") to map to the same value

    * put "Enum" support code in a separate file

    * there is now just one NOT_SET_VALUE

commit f217f237b20ad1aef87d1218b16f12e095d61c25
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 19 14:37:28 2020 -0500

    update externals (#388)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

    * latest from "nitro"

    * std::endian

    * latest from "nitro"

    * latest from "nitro" and "coda-oss"

commit 6ba3ffdaad96c0e4f945cce27af2f8b172ebd884
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 19 10:38:06 2020 -0500

    latest changes from develop/jdsmith (#386)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use "externals" from top-level "install"

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * build with simplified "externals" scheme

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * fix compiler errors from previous merge; mostly #include <thread>

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * latest from "coda-oss"

    * use filesystem::path and std::endian

    * more filesystem from coda-oss

    * less use of sys::

    * NULL -> nullptr

    * use .data() rather than &d[0]

    * mem::BufferView -> std::span

    * const std::span<>& doesn't make much sense

    * need make_span() overload for pointer+size

    * latest from "nitro"

    * std::endian

    * coda-oss now gives us std::endian

    * sys::Filesystem -> std::filesystem

    * don't need to explicitly call fs::path::string() in most cases

    * sys::Filesystem -> std::filesystem

    * fix build errors when using C++17

    * simplify access to some ImageSubheader values

    * newReadControl() returns a std::unique_ptr<> rather than a raw pointer

    * a singleton is much easier in C++11

    * don't need to do manual locking in C++11

    * use a template and some macros to dramatically simplify Enums

    * adjust macros for GCC, provide operators for SWIG

    * got the map entries wrong

    * make getIndices() a bit more robust

    * store a std::unique_ptr<> instead of a raw poniter

    * throw exceptions in getIndices() rather than assuming

    * use Enum<T>.toString() where possible rather than duplicating code

    * remove duplicate code converting from a string to Enum<T>

    * don't explicilty check for "SIDD" as that's already part of getDataType()

    * use std::string instead of char[]

    * reduce use of "delete[]"

    * less use of "SICD" and "SIDD", use six::DataType instead

    * simplify Region buffer management

    * reduce some explicit use of std::shared_ptr<> with std::make_shared and/or auto

    * more reduction in explicit use of std::shared_ptr

    * latest from "nitro"

    * simplify use of six::Region

    * reduce use of explicit .toString()

    * further reduction in explicit use of toString()

    * template specialiaton can't be inline with G++

    * simplify cphd enum creation

    * reduce use of toString() with setAttribute()

commit f990e7735a1135b16f2baf0be11215ec057e3bab
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 19 10:36:33 2020 -0500

    latest from "nitro" (#387)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

    * latest from "nitro"

    * std::endian

    * latest from "nitro"

commit 514403d30f5e42b768ae5675cb8f870086d138c1
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Dec 8 14:30:18 2020 -0500

    latest from develop/jdsmith (#385)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use "externals" from top-level "install"

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * build with simplified "externals" scheme

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * fix compiler errors from previous merge; mostly #include <thread>

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * latest from "coda-oss"

    * use filesystem::path and std::endian

    * more filesystem from coda-oss

    * less use of sys::

    * NULL -> nullptr

    * use .data() rather than &d[0]

    * mem::BufferView -> std::span

    * const std::span<>& doesn't make much sense

    * need make_span() overload for pointer+size

    * latest from "nitro"

    * std::endian

    * coda-oss now gives us std::endian

    * sys::Filesystem -> std::filesystem

    * don't need to explicitly call fs::path::string() in most cases

    * sys::Filesystem -> std::filesystem

    * fix build errors when using C++17

commit a2d5396ec559cde98f9d8adb50c78111a7d884b3
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 18:12:34 2020 -0500

    latest from "nitro" (#383)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

    * latest from "nitro"

commit 12f6f27e269013d95df0dfb4845dc04e831717e1
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 17:51:26 2020 -0500

    latest from develop/jdsmith (#382)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use "externals" from top-level "install"

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * build with simplified "externals" scheme

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * fix compiler errors from previous merge; mostly #include <thread>

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * latest from "coda-oss"

    * use filesystem::path and std::endian

    * more filesystem from coda-oss

    * less use of sys::

    * NULL -> nullptr

    * use .data() rather than &d[0]

    * mem::BufferView -> std::span

    * const std::span<>& doesn't make much sense

    * need make_span() overload for pointer+size

commit e2084e8fad7af3962ef6d6e75d0ee72906f5430b
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 15:56:09 2020 -0500

    latest from coda-oss (#381)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

    * more filesystem from coda-oss

commit 37f162087fd80259f8f14710ef421c4fe5073113
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 15:52:57 2020 -0500

    NULL -> nullptr (#379)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * use filesystem::path and std::endian

    * less use of sys::

    * NULL -> nullptr

commit ef45d66b7ce27551cb9d96555da353ef266c9e9b
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 12:43:44 2020 -0500

    fix build errors from recent changes (#378)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use "externals" from top-level "install"

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * build with simplified "externals" scheme

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * fix compiler errors from previous merge; mostly #include <thread>

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

    * latest from "coda-oss"

commit d038e0e3d68a9dc1783d84ad39f5e03aced505ff
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 12:21:22 2020 -0500

    more use of C++11 (#377)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * use std::unique_ptr<[]> instead of mem::ScopedArray

    * use int32_t et. al. instead of sys::Int32_T

    * use std::byte (not quite working yet, but need to move code to a faster machine)

    * build with std::byte

    * use std::thread::hardware_concurrency() instead of sys::OS().getNumCPUs()

    * sys::Off_T -> ptrdiff_t

    * Revert "sys::Off_T -> ptrdiff_t"

    This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    * sys::Off_T -> int64_t; sys::SSize_T -> ptrdiff_t

commit 10df67a17abcf66dd74e3608195dd5957e0c2241
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 12:20:04 2020 -0500

    latest from "coda-oss" (#376)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

    * latest from "coda-oss"

commit 48deaeb01376d88956a1b84097ae953c2e939c85
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Dec 5 10:05:33 2020 -0500

    latest "nitro" (#375)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

    * latest from "nitro"

    * match nitro -> nitf change

    * make_span()

commit b03c97994b65dad3e5fe5af14be3dc43379423f3
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Wed Dec 2 10:55:11 2020 -0500

    use c++11 features (#374)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * use int64_t, etc. instead of sys::Int64_T

    * mem::SharedPtr -> std::shared_ptr

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

    * update "nitro" to get SegmentMemorySource overloads

commit f1b6d2255807c658c55a83232cd3e8b40a59348b
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Dec 1 17:53:46 2020 -0500

    update externals (#373)

    * update "nitro"

    * update coda-oss and fix compiler errors

    * update coda-oss and nitro with less use of sys::

    * unit-test paths are wrong for "externals"

commit 4538574440414f950dd454424ee00ee15754fe0e
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Dec 1 13:11:34 2020 -0500

    remove some compiler warnings (#372)

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * turn on compiler warnings

    * crank-up warning level

    * enable "Warnings as errors"

    * turn on all warnings (many #pragma'd away)

    * get rid of more warnings

    * adjust more #pragma's

commit 79aa44ff0388a3ba7cdcc51d42bd1c11475efdc4
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Nov 30 13:45:16 2020 -0500

    add another unit-test (#371)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * turn on /Wall, fix some warnings

    * C++17 generates more warnings that I don't want to fix right now

    * removed some compiler warnings from third-party code

    * comment-out use of C++17's <filesystem>

    * tweak project settings for consistency

    * unit-test for createFakeComplexData()

commit ce28071805c3d6aeb23413ff13dd1d4f0c75e7fc
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Mon Nov 9 14:51:12 2020 -0500

    use .tar, not .tar.gz

commit f9283e8b6eb56a2ca4fb193964240087a8c1ce7d
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Nov 9 14:31:00 2020 -0500

    preserve utf8 in XML text (#363)

    * pass io::Encoding::Utf8 to print() and prettyPrint() to preserve UTF-8 in output

    * store the value of xml::lite::MinidomParser::preserveCharacterData() so we can figure out the encoding

    * Don't want to set a dummy schema path to a directory that exists

    * add a unit-test for UTF-8 characters in "Classification"

    * fix isUnclassified() so it works for "NON CLASSIFIÉ / UNCLASSIFIED"

    * Revert "Merge branch 'main' into bugfix/preserve_UTF8_in_classified_field"

    This reverts commit 12534c9701ce19169bcb1d8c6051813d67dee8e2, reversing
    changes made to 02ce75550c12b14c9b4bdf3f04f18716220c5152.

    * account for coda-oss changes where TextEncoding is part of the OutputStream

    * get the right verson of Element.h

    * use new xml::lite to read/write XML in UTF-8

    * be sure we can read-in and process UTF-8 from a NITF

    * assume UTF-8 on *ix and Windows-1252 on Windows

    * reduce "gratuatous" diffs for simpler merge request

    * one more unneeded diff

    * French -> Canada

    * latest from coda-oss

    * trying to get the test_valid_six unittest working on Linux

commit 3c07e7278d53b0500d35c1153bbd827f74b1b090
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Nov 9 14:10:17 2020 -0500

    update "nitro" and "coda-oss" (#370)

    * update "nitro" and "coda-oss"

    * Delete CMakeSettings.json

    * changeFileHeader() doesn't (yet) work in "externals"

commit 5c4bfb60bdb0dd778135dc7476b82735e82b0413
Merge: 950668d00 90e42da6b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Nov 4 09:35:45 2020 -0500

    Merge branch 'develop/update_externals' into main

commit 90e42da6b5a3c2cb23e2183bbd5afc46b1785507
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Nov 4 09:34:33 2020 -0500

    use sys::Filesystem

commit f014cf4b86e62d26971e458af52d5e28f183ea6d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Nov 3 18:27:23 2020 -0500

    use Filesystem.h from coda-oss instead of <filesystem>

commit 950668d00022199c0c5e4a60f6ee0a1524c92fbc
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Nov 3 15:51:14 2020 -0500

    latest from coda-oss (#369)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

    * latest from "main" on coda-oss: xml.lite updates for UTF-8

    * restore changes lost in merge

    * latest from coda-oss

    * latest from coda-oss

    * latest from coda-oss

    * latest from "main" on coda-oss

commit 29d743f25f42b89e9c34a7d64ae659fb263c5073
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Nov 3 15:30:24 2020 -0500

    latest from "main" on coda-oss

commit 70d253c1f34df1bd79aca35737e9fc60ab97cc61
Merge: f332607bf 3a042b670
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Nov 3 15:24:47 2020 -0500

    Merge branch 'main' into develop/update_externals

commit 3a042b6707eef97a43b508513ed11ca7f7bc0f2a
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Nov 2 16:03:00 2020 -0500

    latest from coda-oss (#368)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

    * latest from "main" on coda-oss: xml.lite updates for UTF-8

    * restore changes lost in merge

    * latest from coda-oss

    * latest from coda-oss

    * latest from coda-oss

commit f332607bfe6ada9958f68c2fa370055600756486
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Nov 2 15:41:41 2020 -0500

    latest from coda-oss

commit 5c48090a2dbb0c665a12f45cf126329395fcb0c4
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 17:56:20 2020 -0400

    Develop/update externals (#367)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

    * latest from "main" on coda-oss: xml.lite updates for UTF-8

    * restore changes lost in merge

    * latest from coda-oss

    * latest from coda-oss

commit 313a60141a3e42d99067fa5bc6a9a98cfbe6f575
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 17:28:09 2020 -0400

    latest from coda-oss

commit f71c7eda1610f1dc5f9668c541c8cd925fd3c963
Merge: d3423b3b8 404dadcd2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 17:26:57 2020 -0400

    Merge branch 'main' into develop/update_externals

commit 404dadcd26851a243332d8263e57230687bad231
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 16:07:44 2020 -0400

    another update to coda-oss (#366)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

    * latest from "main" on coda-oss: xml.lite updates for UTF-8

    * restore changes lost in merge

    * latest from coda-oss

commit d3423b3b832f65dfc699c6faf7e1a055b226f2d0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 14:57:51 2020 -0400

    latest from coda-oss

commit 18613b5bfb2e988e1c809a3df774e6335a5537b9
Merge: 8ff24519e 21a550c5a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 14:48:50 2020 -0400

    Merge branch 'main' into develop/update_externals

commit 21a550c5aca6c0c2f0d9cb9112be3f8f84c54cdb
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 12:35:42 2020 -0400

    update coda-oss (#365)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

    * latest from "main" on coda-oss: xml.lite updates for UTF-8

    * restore changes lost in merge

commit 8ff24519ec9c24df4d2a4f5302eaec697e048737
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 12:12:01 2020 -0400

    restore changes lost in merge

commit f996fa8e2f7c496b5526825695334e64fdbf66d9
Merge: 1edffffdd fe9dffff6
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 11:47:16 2020 -0400

    Merge branch 'main' into develop/update_externals

commit 1edffffddef9bdf94bd67a68aacfd03d5ee09cdd
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 26 11:27:40 2020 -0400

    latest from "main" on coda-oss: xml.lite updates for UTF-8

commit fe9dffff6a19a4793dabad070b01685fe784fdfb
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 14:09:05 2020 -0400

    latest from coda-oss "main" (#364)

    * update coda-oss with latest from "main"

    * coda-oss updates to make TextEncoding part of the OutputStream

    * updates from coda-oss to make TextEncoding part of the OutputStream

    * fix StringStream() .ctor()

    * one more coda-oss update

commit cdb08935c7c6387b343b491925fac4f4a126425c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 13:43:18 2020 -0400

    one more coda-oss update

commit 39344b1593c503a1b2c162dbf53b16ee7795dfa1
Merge: 97ecde918 92af349d9
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 13:39:17 2020 -0400

    Merge branch 'main' into develop/update_externals

commit 97ecde918cab214c3ec9666b05b9e809897c72fc
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 13:27:07 2020 -0400

    fix StringStream() .ctor()

commit 2be4824922dee267a5d0244c90ef4fba70da461d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 13:16:35 2020 -0400

    updates from coda-oss to make TextEncoding part of the OutputStream

commit c7ff9316857b10d2f9a956565b01cd992ca91522
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Oct 21 13:11:15 2020 -0400

    coda-oss updates to make TextEncoding part of the OutputStream

commit 92af349d98f374a4514b26d507d274b5e1e9074d
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Oct 20 12:05:14 2020 -0400

    update coda-oss with latest from "main" (#362)

commit 495d74aef2a4dea3e2540eba436d84a157716db1
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 20 11:41:40 2020 -0400

    update coda-oss with latest from "main"

commit d16b60da16d53960bb981514dd0dfc30c0233a44
Merge: e8636f450 52207d7b3
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 20 11:34:39 2020 -0400

    Merge branch 'main' of github.com:ngageoint/six-library into main

commit 52207d7b3aadb6c37055760bbb4e0706f0d88497
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Oct 17 17:41:44 2020 -0400

    build crop_sicd in Visual Studio (#361)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

    * can't have "check_valid_six" as a directory for *ix build

    * build crop_sicd

    * build crop_sicd

commit e8636f45047bb96d9a500ebeb2ecbe4cdccafc2b
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Oct 17 16:44:46 2020 -0400

    build crop_sicd

commit bb1dbe6018b5afaa8f6bded43bc995f9e0ce695f
Author: Dan Smith <dan.smith@maxar.com>
Date:   Sat Oct 17 15:43:33 2020 -0400

    can't have "check_valid_six" as a directory for *ix build

commit 67ee2841f15b36e2dfcc1becdbcd5e0b01c4bd1e
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Oct 17 15:30:31 2020 -0400

    get rid of hard-coded paths with <filesystem> (#360)

    * put common #includes for PCH in a single file

    * build check_valid_six

    * use EXIT_* rather than 0/1

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

    * use <filesystem> to remove hard-coded paths

    * in Visual Studio, run check_valid_six with a pre-defined path

    * tweak plugin dir

commit 165fb1dc4ef6cfcc632c9dbbeeea5a631b46b5e3
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Sat Oct 17 14:37:49 2020 -0400

    use c++11 (#359)

    * getting rid of std::auto_ptr<> because it's gone in C++17

    * build all projects with C++17

commit 54b2d6fb0b58558e45b2cc9778c305f8693575df
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Wed Oct 14 16:38:32 2020 -0400

    build with Visual Studio 2019 (#358)

    * Revert "Create codeql-analysis.yml"

    This reverts commit 43882771cbe3bf8d934b1e369ee68e935c8eb07f.

    * build nitro projects in SIX solution

    * build "six" as a Visual Studio project

    * build "scene" with Visual Studio

    * build cphd with Visual Studio

    * build cphd03 with Visual Studio

    * build six.sicd with Visual Studio

    * build six.sidd with Visual Studio

    * buid six.convert with Visual Studio

    * add a GTest project

    * trying to get a unittest working

    * build XML_DATA_CONTENT

    * get a NITF unit-test working :-)

    * run all "six" unittests

    * fix dummy DEFAULT_SCHEMA_PATH

    * allow unit-tests to run in Visual Studio

    * run SIDD unit-tests from Visual Studio

    * set SIX_SCHEMA_PATH so unittest works

    * run SICD unittests in Visual Studio

    * build and run six.sicd unittests in Visual Studio

    * set NITF_PLUGIN_PATH for sicd_test_area_plane

    * build cphd03 unittests in Visual Studio

    * run remaining cphd03 unittests

    * fix build error introduced with VS2019 changes

    * build cphd unittests in Visual Studio

    * build & run remaining cphd unittests in Visual Studio

commit 7e9999649ba0c2bc46a6bb1b1159475fba3c8a9d
Merge: 87307818b 790ab2694
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 14:38:53 2020 -0400

    Merge pull request #357 from ngageoint/develop/jdsmith

    build externals/coda-oss by itself

commit 790ab26946e7336b19767945f727816cbe145ff5
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 14:08:18 2020 -0400

    build externals/coda-oss by itself

commit 87307818b0270f83483f77f08ac1ce05a925de92
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Tue Oct 13 13:47:56 2020 -0400

    fix nitf::Field to get rid of compiler errors

commit 571196e0b60ece0095140a7890df8e50fa38525a
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 13:21:09 2020 -0400

    Revert "Create codeql-analysis.yml"

    This reverts commit b261bbd26098485afd60f490e93b90fc4b7d84ed.

commit b6617ecd990bb3a51eacf5ef3c600e11c51692da
Merge: 3f130257d 1fc144409
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 13:19:39 2020 -0400

    Merge pull request #356 from ngageoint/develop/jdsmith

    update "nitro" and "coda-oss"

commit 1fc1444096d76e4d4c2466dce114621e0288c5ea
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 12:35:39 2020 -0400

    update nitro with latest from "main"

commit 7b79bdf75715b2b5f38319516d340ad49e6a2048
Merge: d13fd9767 3f130257d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 12:20:49 2020 -0400

    Merge branch 'main' into develop/jdsmith

commit d13fd9767cd688b0b167688fb5fcce555a01bbc1
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 13 12:20:02 2020 -0400

    update coda-oss with latest from "main"

commit 3f130257d86cbbf09cb6fdbf7b8f46cffeac87be
Merge: 43882771c d216783a2
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Oct 6 09:47:36 2020 -0400

    Merge commit 'd216783a2d5ae168a34bc41da70c5c0004648c4a' into main

commit 43882771cbe3bf8d934b1e369ee68e935c8eb07f
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Oct 6 09:09:47 2020 -0400

    Create codeql-analysis.yml

commit 75868bb52f62f30eea6b4b7236d980be55465d8b
Merge: 533878c78 a85c00bff
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Mon Oct 5 15:18:16 2020 -0400

    Merge pull request #354 from ngageoint/develop/main

    update "externals"

commit a85c00bff760b055e89e4f7b67154503199529ef
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 5 14:37:39 2020 -0400

    update coda-oss

commit d0d9f24e944114983c4c28b0e2beeb1cd5eeddba
Author: Dan Smith <dan.smith@maxar.com>
Date:   Mon Oct 5 14:29:50 2020 -0400

    update externals/nitro

commit 533878c78ca2227c469bad9ec3cd9eb2bc4324b2
Merge: 28166d355 8cd8a703d
Author: J. Daniel Smith <dan.smith@maxar.com>
Date:   Tue Sep 22 14:28:52 2020 -0400

    Merge pull request #349 from ngageoint/develop/main

    update with latest from "nitro:main"

commit 8cd8a703dc2ab4f71cd0f20372f1616d0a11bdf4
Author: Dan Smith <dan.smith@maxar.com>
Date:   Tue Sep 22 13:41:07 2020 -0400

    latest from nitro:main

commit 916f62a29b4666b32452d1ace285615ca1ebd07c
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Sat Sep 19 13:59:46 2020 -0400

    impelement std::auto_ptr "overrides"

commit 914710ccf93bdb5566b9584a4ff1ceb8c2c32e06
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Sat Sep 19 12:48:52 2020 -0400

    provide std::auto_ptr "overloads" so that existing Python wrapper code continues to work w/o changes

commit c95e858895cbbe675399414bab0fefd463040541
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Wed Sep 16 17:55:42 2020 -0400

    need std::auto_ptr<> overloads for pre-generated Python wrapper code

commit ce51201193fa65984b11d2f2096bf611b4123cd0
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 17:31:04 2020 -0400

    std::auto_ptr -> std::unique_ptr

commit f121bad9bcc7170a041195262450f513d0516b8e
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 15:35:29 2020 -0400

    ignore CMake-generated files

commit 130e3cdcf7c9a9b0de6e3796d289c532e975544d
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 14:22:26 2020 -0400

    fix bad merge

commit cbb9b90630fd2f2971874d96214a9fee741f11d8
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 14:20:01 2020 -0400

    don't want "docs" directory in externals/nitro

commit e6fe2f18f70f43ed413dc22d0c8d27bf19d863b6
Merge: b36a80970 60a45b805
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 14:19:07 2020 -0400

    Merge branch 'develop/master' into develop/main

commit b36a8097083afa8e55eb709b0b4ece168e7f995c
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 13:45:40 2020 -0400

    update externals/coda-oss with latest from "main"

commit acc353ef6794bc39b294f854b04c7e81621e1574
Author: Dan Smith <dan.smith@maxar.com>
Date:   Wed Sep 16 13:42:00 2020 -0400

    update externals/nitro with latest from "main"

commit ce6044bac8584272ceb45ede3c58ffe7ea7e468d
Author: Dan Smith <Dan.Smith@maxar.com>
Date:   Mon Aug 31 13:24:57 2020 -0400

    updates from coda-oss and nitro

commit 60a45b805a4b2d5c3ad1c6afe6feb6628559689e
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 16:47:32 2020 -0400

    nitf::Int8 -> int8_t

commit 554c97428a4a0c0fcec0e15e7c09a0df224e0cd7
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 16:30:06 2020 -0400

    update "nitro"

commit 66e76696a1f1e3d5b07327dff8d365d59b31e37a
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 15:39:17 2020 -0400

    update nitro/nrt

commit 0a75cff359e8133490eed0db2d2d1090860e9f76
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 13:39:44 2020 -0400

    Revert "update externals/nitro with latest from nitro repo"

    This reverts commit 7eb28137e4f2a9c494b2191d7340fd7210663b88.

commit 7eb28137e4f2a9c494b2191d7340fd7210663b88
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 11:30:27 2020 -0400

    update externals/nitro with latest from nitro repo

commit e212252abdf897a5de1f74e67285ac8a7f690862
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 11:47:45 2020 -0400

    use in32_t, etc. instead of nitf::Int32_t

commit b42f93e2e77b2bca05d06314f9d5e3a28c56285d
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 13:25:26 2020 -0400

    Revert "Merge branch 'feature/use_standard_C_types' into develop/jdsmith"

    This reverts commit aac9d2cbb37d3fb228fc0368500f90374d8cb105, reversing
    changes made to 89b7807ef0a32c0e7e47a41e37d4b3a5fb0e4026.

commit c36469f1cafad0b704be4d37d532fc66134e6170
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 13:25:18 2020 -0400

    Revert "Merge branch 'feature/update_nitro' into develop/jdsmith"

    This reverts commit 52001eede19a37bbc9e3cbb8a5c25ce94142421e, reversing
    changes made to aac9d2cbb37d3fb228fc0368500f90374d8cb105.

commit 52001eede19a37bbc9e3cbb8a5c25ce94142421e
Merge: aac9d2cbb f0e51d412
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 13:20:12 2020 -0400

    Merge branch 'feature/update_nitro' into develop/jdsmith

commit aac9d2cbb37d3fb228fc0368500f90374d8cb105
Merge: 89b7807ef a1d40381d
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 13:20:02 2020 -0400

    Merge branch 'feature/use_standard_C_types' into develop/jdsmith

commit a1d40381d6c8494e6b1e2c8705da354eb9365fce
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 11:47:45 2020 -0400

    use in32_t, etc. instead of nitf::Int32_t

commit f0e51d412904a401669804f47cacac2b2c54b91d
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 11:30:27 2020 -0400

    update externals/nitro with latest from nitro repo

commit 89b7807ef0a32c0e7e47a41e37d4b3a5fb0e4026
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 11:01:21 2020 -0400

    new/updated "docs" directory

commit 447f29acfd1b7085d5241623ff589d0ea347c8c0
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 10:51:13 2020 -0400

    Create CMakeSettings.json

commit 6b1badc1b2af667906eca6aaf038290cb08b295d
Merge: 11b7a17e4 af090e590
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 10:45:54 2020 -0400

    Merge branch 'master' into develop/jdsmith

commit 11b7a17e48c1892fe814b407aa65361ff2b2c27d
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 10:41:49 2020 -0400

    not sure what to do with CMakeSettings.json

commit 05c5da24ee5913d49964975aabafbce371a211f3
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Tue Aug 11 10:40:43 2020 -0400

    update .gitignore

commit 25c99e0bb5d4f411297dff1ac551c403220b96d9
Author: Dan Smith <j.daniel.smith@mdaus.com>
Date:   Mon Jul 20 13:37:03 2020 -0400

    add contact details
---
 .../modules/c++/mem/include/mem/SharedPtr.h   |  14 +-
 .../c++/mem/include/mem/SharedPtrCpp11.h      |  31 ++++-
 .../c++/mem/unittests/test_shared_ptr.cpp     | 123 ++++++++++++++----
 .../modules/c++/nitf/include/nitf/Field.hpp   |   4 +-
 .../modules/c++/nitf/include/nitf/TRE.hpp     |  80 ++++++++++--
 .../modules/c++/nitf/source/ImageReader.cpp   |   2 +-
 .../nitro/modules/c++/nitf/source/TRE.cpp     |  86 ++++++------
 .../c++/nitf/unittests/test_load_plugins.cpp  |   7 +-
 .../c++/nitf/unittests/test_tre_mods++.cpp    |  27 ++++
 9 files changed, 285 insertions(+), 89 deletions(-)

diff --git a/externals/coda-oss/modules/c++/mem/include/mem/SharedPtr.h b/externals/coda-oss/modules/c++/mem/include/mem/SharedPtr.h
index 4e54c8909..f8254bbae 100644
--- a/externals/coda-oss/modules/c++/mem/include/mem/SharedPtr.h
+++ b/externals/coda-oss/modules/c++/mem/include/mem/SharedPtr.h
@@ -20,8 +20,11 @@
  *
  */
 
-#ifndef __MEM_SHARED_PTR_H__
-#define __MEM_SHARED_PTR_H__
+#ifndef CODA_OSS_mem_SharedPtr_h_INCLUDED_
+#define CODA_OSS_mem_SharedPtr_h_INCLUDED_
+#pragma once
+
+#include <memory>
 
 #include <config/coda_oss_config.h>
 
@@ -34,10 +37,15 @@
 // as part of a SWIG interface will result in a missing template type error.
 namespace mem
 {
+#if !CODA_OSS_enable_mem_SharedPtr
+template <typename T>
+using SharedPtr = std::shared_ptr<T>;
+#else
 template<typename T>
 class SharedPtr;
+#endif
 }
 
 #include <mem/SharedPtrCpp11.h>
 
-#endif
+#endif // CODA_OSS_mem_SharedPtr_h_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h b/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h
index a6a5defb9..a4d53f0d2 100644
--- a/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h
+++ b/externals/coda-oss/modules/c++/mem/include/mem/SharedPtrCpp11.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __MEM_SHARED_PTR_CPP_11_H__
-#define __MEM_SHARED_PTR_CPP_11_H__
+#ifndef CODA_OSS_mem_SharedPtrCpp11_h_INCLUDED_
+#define CODA_OSS_mem_SharedPtrCpp11_h_INCLUDED_
 #pragma once
 
 #include <memory>
@@ -43,6 +43,14 @@ template <typename T>
 using auto_ptr = std::unique_ptr<T>;
 #endif
 
+// Pretty much give-up on mem::SharedPtr as it's too hard to get something that will
+// compile with all the different compilers; let somebody else worry about that
+// via std::shared_ptr.  The only code change is use_count() instead of getCount(),
+// and that's mostly used in unit-tests.
+#if !CODA_OSS_enable_mem_SharedPtr
+template<typename T>
+using SharedPtr = std::shared_ptr<T>;
+#else
 /*!
  *  \class SharedPtr
  *  \brief This is a derived class of std::shared_ptr. The purpose of this
@@ -71,8 +79,13 @@ class SharedPtr : public std::shared_ptr<T>
     SharedPtr(SharedPtr&&) = default;
     SharedPtr& operator=(SharedPtr&&) = default;
 
-    SharedPtr(std::shared_ptr<T> ptr) : std::shared_ptr<T>(ptr) {}
-    SharedPtr& operator=(const std::shared_ptr<T>& ptr)
+    template<typename OtherT>
+    SharedPtr(const std::shared_ptr<OtherT>& ptr)
+    {
+        *this = ptr;
+    } 
+    template<typename OtherT>
+    SharedPtr& operator=(const std::shared_ptr<OtherT>& ptr)
     {
       std::shared_ptr<T>& base = *this;
       base = ptr;
@@ -116,6 +129,7 @@ class SharedPtr : public std::shared_ptr<T>
         return std::shared_ptr<T>::use_count();
     }
 };
+#endif // CODA_OSS_enable_mem_SharedPtr
 
 // C++11 inadvertently ommitted make_unique; provide it here. (Swiped from <memory>.)
 namespace make
@@ -163,4 +177,11 @@ void unique(TArgs&&...) = delete;
 }  // namespace make
 } // namespace mem
 
-#endif
+// try to make code changes a tiny bit easier?
+template<typename T>
+inline long getCount(const std::shared_ptr<T>& p) noexcept // be sure const& so that calling doesn't increment!
+{
+    return p.use_count();
+}
+
+#endif // CODA_OSS_mem_SharedPtrCpp11_h_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/mem/unittests/test_shared_ptr.cpp b/externals/coda-oss/modules/c++/mem/unittests/test_shared_ptr.cpp
index 149ab4bff..dc00dc27c 100644
--- a/externals/coda-oss/modules/c++/mem/unittests/test_shared_ptr.cpp
+++ b/externals/coda-oss/modules/c++/mem/unittests/test_shared_ptr.cpp
@@ -94,7 +94,9 @@ TEST_CASE(testAutoPtrConstructor)
     const mem::SharedPtr<int> ptr(autoPtr.release());
     TEST_ASSERT_EQ(ptr.get(), rawPtr);
     TEST_ASSERT_EQ(autoPtr.get(), static_cast<int *>(NULL));
-    TEST_ASSERT_EQ(ptr.getCount(), 1);
+    //TEST_ASSERT_EQ(ptr.getCount(), 1);
+    TEST_ASSERT_EQ(ptr.use_count(), 1);
+    TEST_ASSERT_EQ(getCount(ptr), 1);
 }
 
 TEST_CASE(testAutoPtrReset)
@@ -113,7 +115,9 @@ TEST_CASE(testAutoPtrReset)
     sharedPtr.reset(autoPtr.release());
     TEST_ASSERT_EQ(sharedPtr.get(), rawPtr1);
     TEST_ASSERT_NULL(autoPtr.get());
-    TEST_ASSERT_EQ(sharedPtr.getCount(), 1);
+    //TEST_ASSERT_EQ(sharedPtr.getCount(), 1);
+    TEST_ASSERT_EQ(sharedPtr.use_count(), 1);
+    TEST_ASSERT_EQ(getCount(sharedPtr), 1);
 }
 
 TEST_CASE(testCopying)
@@ -124,14 +128,21 @@ TEST_CASE(testCopying)
         mem::SharedPtr<int> ptr1(rawPtr);
         TEST_ASSERT_EQ(ptr1.get(), rawPtr);
         TEST_ASSERT_EQ(*ptr1.get(), 89);
-        TEST_ASSERT_EQ(ptr1.getCount(), 1);
+        //TEST_ASSERT_EQ(ptr1.getCount(), 1);
+        TEST_ASSERT_EQ(ptr1.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(ptr1), 1);
 
         const mem::SharedPtr<int> ptr2(ptr1);
         TEST_ASSERT_EQ(ptr1.get(), rawPtr);
         TEST_ASSERT_EQ(ptr2.get(), rawPtr);
         TEST_ASSERT_EQ(*ptr2.get(), 89);
-        TEST_ASSERT_EQ(ptr1.getCount(), 2);
-        TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        //TEST_ASSERT_EQ(ptr1.getCount(), 2);
+        TEST_ASSERT_EQ(ptr1.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr1), 2);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        TEST_ASSERT_EQ(ptr2.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr2), 2);
+
 
         // We already know they're pointing at the same underlying data, but
         // show it this way too for kicks
@@ -142,18 +153,27 @@ TEST_CASE(testCopying)
         // Decrement the reference count
         ptr1.reset();
         TEST_ASSERT_EQ(*ptr2.get(), 334);
-        TEST_ASSERT_EQ(ptr2.getCount(), 1);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 1);
+        TEST_ASSERT_EQ(ptr2.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(ptr2), 1);
+
 
         // Do the same thing but show that ptr2 going out of scope is
         // equivalent to it being reset
         ptr3.reset(new mem::SharedPtr<int>(ptr2));
         TEST_ASSERT_EQ(ptr3->get(), rawPtr);
-        TEST_ASSERT_EQ(ptr2.getCount(), 2);
-        TEST_ASSERT_EQ(ptr3->getCount(), 2);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        TEST_ASSERT_EQ(ptr2.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr2), 2);
+        //TEST_ASSERT_EQ(ptr3->getCount(), 2);
+        TEST_ASSERT_EQ(ptr3->use_count(), 2);
+        TEST_ASSERT_EQ(getCount(*ptr3), 2);
     }
 
     TEST_ASSERT_EQ(ptr3->get(), rawPtr);
-    TEST_ASSERT_EQ(ptr3->getCount(), 1);
+    //TEST_ASSERT_EQ(ptr3->getCount(), 1);
+    TEST_ASSERT_EQ(ptr3->use_count(), 1);
+    TEST_ASSERT_EQ(getCount(*ptr3), 1);
 }
 
 static std::shared_ptr<int> getIntSP()
@@ -169,15 +189,22 @@ TEST_CASE(testAssigning)
         mem::SharedPtr<int> ptr1(rawPtr);
         TEST_ASSERT_EQ(ptr1.get(), rawPtr);
         TEST_ASSERT_EQ(*ptr1.get(), 89);
-        TEST_ASSERT_EQ(ptr1.getCount(), 1);
+        //TEST_ASSERT_EQ(ptr1.getCount(), 1);
+        TEST_ASSERT_EQ(ptr1.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(ptr1), 1);
 
         mem::SharedPtr<int> ptr2;
         ptr2 = ptr1;
         TEST_ASSERT_EQ(ptr1.get(), rawPtr);
         TEST_ASSERT_EQ(ptr2.get(), rawPtr);
         TEST_ASSERT_EQ(*ptr2.get(), 89);
-        TEST_ASSERT_EQ(ptr1.getCount(), 2);
-        TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        //TEST_ASSERT_EQ(ptr1.getCount(), 2);
+        TEST_ASSERT_EQ(ptr1.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr1), 2);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        TEST_ASSERT_EQ(ptr2.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr2), 2);
+
 
         // We already know they're pointing at the same underlying data, but
         // show it this way too for kicks
@@ -188,22 +215,51 @@ TEST_CASE(testAssigning)
         // Decrement the reference count
         ptr1.reset();
         TEST_ASSERT_EQ(*ptr2.get(), 334);
-        TEST_ASSERT_EQ(ptr2.getCount(), 1);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 1);
+        TEST_ASSERT_EQ(ptr2.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(ptr2), 1);
+
 
         // Do the same thing but show that ptr2 going out of scope is
         // equivalent to it being reset
         ptr3 = ptr2;
         TEST_ASSERT_EQ(ptr3.get(), rawPtr);
-        TEST_ASSERT_EQ(ptr2.getCount(), 2);
-        TEST_ASSERT_EQ(ptr3.getCount(), 2);
+        //TEST_ASSERT_EQ(ptr2.getCount(), 2);
+        TEST_ASSERT_EQ(ptr2.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr2), 2);
+        //TEST_ASSERT_EQ(ptr3.getCount(), 2);
+        TEST_ASSERT_EQ(ptr3.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(ptr3), 2);
     }
 
     TEST_ASSERT_EQ(ptr3.get(), rawPtr);
-    TEST_ASSERT_EQ(ptr3.getCount(), 1);
-
+    //TEST_ASSERT_EQ(ptr3.getCount(), 1);
+    TEST_ASSERT_EQ(ptr3.use_count(), 1);
+    TEST_ASSERT_EQ(getCount(ptr3), 1);
 
     mem::SharedPtr<int> result;
     result = getIntSP();
+
+    // code like this is in CODA
+    {
+      std::shared_ptr<Bar> mTileStreams_;
+      auto mTileStreams = &mTileStreams_;
+      mem::SharedPtr<Foo> outStream_(mTileStreams[0]); // clearly copy
+      mem::SharedPtr<Foo> outStream = mTileStreams[0]; // copy
+      outStream = mTileStreams[0]; // assignment
+    }    
+    { // variations of the above;
+      mem::SharedPtr<Bar> mTileStreams_;
+      auto mTileStreams = &mTileStreams_;
+      mem::SharedPtr<Foo> outStream = mTileStreams[0]; // copy
+      outStream = mTileStreams[0]; // assignment
+    }
+    { // variations of the above;
+      mem::SharedPtr<Bar> mTileStreams_;
+      auto mTileStreams = &mTileStreams_;
+      std::shared_ptr<Foo> outStream = mTileStreams[0]; // copy
+      outStream = mTileStreams[0]; // assignment
+    }
 }
 
 TEST_CASE(testSyntax)
@@ -223,7 +279,9 @@ TEST_CASE(testCasting)
         Bar* const rawBar(new Bar(456));
         const mem::SharedPtr<Foo> fooPtr(rawBar);
         TEST_ASSERT_EQ(fooPtr.get(), rawBar);
-        TEST_ASSERT_EQ(fooPtr.getCount(), 1);
+        //TEST_ASSERT_EQ(fooPtr.getCount(), 1);
+        TEST_ASSERT_EQ(fooPtr.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(fooPtr), 1);
     }
 
     {
@@ -233,23 +291,34 @@ TEST_CASE(testCasting)
         const mem::SharedPtr<Foo> fooPtr(autoBar.release());
         TEST_ASSERT_EQ(fooPtr.get(), rawBar);
         TEST_ASSERT_EQ(autoBar.get(), static_cast<Bar *>(NULL));
-        TEST_ASSERT_EQ(fooPtr.getCount(), 1);
+        //TEST_ASSERT_EQ(fooPtr.getCount(), 1);
+        TEST_ASSERT_EQ(fooPtr.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(fooPtr), 1);
     }
 
     {
         // Test creating SharedPtr of base class from SharedPtr of derived
         Bar* const rawBar(new Bar(456));
         const mem::SharedPtr<Bar> barPtr(rawBar);
-        TEST_ASSERT_EQ(barPtr.getCount(), 1);
+        //TEST_ASSERT_EQ(barPtr.getCount(), 1);
+        TEST_ASSERT_EQ(barPtr.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(barPtr), 1);
         const mem::SharedPtr<Foo> fooPtr(barPtr);
         TEST_ASSERT_EQ(fooPtr.get(), rawBar);
-        TEST_ASSERT_EQ(fooPtr.getCount(), 2);
+        //TEST_ASSERT_EQ(fooPtr.getCount(), 2);
+        TEST_ASSERT_EQ(fooPtr.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(fooPtr), 2);
         TEST_ASSERT_EQ(barPtr.get(), rawBar);
-        TEST_ASSERT_EQ(barPtr.getCount(), 2);
+        //TEST_ASSERT_EQ(barPtr.getCount(), 2);
+        TEST_ASSERT_EQ(barPtr.use_count(), 2);
+        TEST_ASSERT_EQ(getCount(barPtr), 2);
+
 
         const mem::SharedPtr<Foo> fooPtr2 = barPtr;
         TEST_ASSERT_EQ(fooPtr2.get(), rawBar);
-        TEST_ASSERT_EQ(fooPtr2.getCount(), 3);
+        //TEST_ASSERT_EQ(fooPtr2.getCount(), 3);
+        TEST_ASSERT_EQ(fooPtr2.use_count(), 3);
+        TEST_ASSERT_EQ(getCount(fooPtr2), 3);
     }
 
     {
@@ -257,11 +326,15 @@ TEST_CASE(testCasting)
         // from a class with a SharedPtr of derived as parameter
         Bar* const rawBar(new Bar(456));
         const mem::SharedPtr<Bar> barPtr(rawBar);
-        TEST_ASSERT_EQ(barPtr.getCount(), 1);
+        //TEST_ASSERT_EQ(barPtr.getCount(), 1);
+        TEST_ASSERT_EQ(barPtr.use_count(), 1);
+        TEST_ASSERT_EQ(getCount(barPtr), 1);
         const BarPtrTest barTest(barPtr);
         TEST_ASSERT_EQ(barTest.mFooPtr.get(), rawBar);
         TEST_ASSERT_EQ(barTest.mBarPtr.get(), rawBar);
-        TEST_ASSERT_EQ(barPtr.getCount(), 3);
+        //TEST_ASSERT_EQ(barPtr.getCount(), 3);
+        TEST_ASSERT_EQ(barPtr.use_count(), 3);
+        TEST_ASSERT_EQ(getCount(barPtr), 3);
     }
 }
 
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
index 7d8a3cf02..d0fe69347 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/Field.hpp
@@ -302,9 +302,9 @@ class NITRO_NITFCPP_API Field /*final*/ : public nitf::Object<nitf_Field> // no
         const auto pNative = getNativeOrThrow();
         return std::string(pNative->raw, pNative->length);
     }
-    std::string toString() const
+    std::string toString(bool trim=false) const
     {
-        return *this;
+        return trim ? toTrimString() : *this;
     }
     std::string toTrimString() const
     {
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp b/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
index 7722c689a..f4bcc2804 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
@@ -20,11 +20,13 @@
  *
  */
 
-#ifndef __NITF_TRE_HPP__
-#define __NITF_TRE_HPP__
+#ifndef NITF_TRE_hpp_INCLUDED_
+#define NITF_TRE_hpp_INCLUDED_
+#pragma once
 
 #include <string>
 #include <cstddef>
+#include <type_traits>
 
 #include "nitf/Field.hpp"
 #include "nitf/Object.hpp"
@@ -169,9 +171,10 @@ struct NITRO_NITFCPP_API TREFieldIterator : public nitf::Object<nitf_TREEnumerat
  */
 DECLARE_CLASS(TRE)
 {
-    void setField(const std::string & key, const std::string & strValue, NITF_DATA * data, size_t dataLength, bool forceUpdate);
+    nitf_Field& nitf_TRE_getField(const std::string&) const;
+    void setFieldValue(const nitf_Field&, const std::string & tag, const std::string & data, bool forceUpdate);
 
-    public:
+public:
     typedef nitf::TREFieldIterator Iterator;
 
     //! Copy constructor
@@ -200,7 +203,11 @@ DECLARE_CLASS(TRE)
 
     // for unit-tests
     static nitf_TRE* create(const std::string & tag, const std::string & id, nitf_Error& error) noexcept;
-    static bool setField(nitf_TRE * tre, const std::string & tag, const std::string& data, nitf_Error& error) noexcept;
+    static bool setFieldValue(nitf_TRE*, const std::string & tag, const std::string& data, nitf_Error&) noexcept;
+    static bool setField(nitf_TRE* tre, const std::string & tag, const std::string & data, nitf_Error & error) noexcept
+    {
+        return setFieldValue(tre, tag, data, error);
+    }
 
     //! Clone
     nitf::TRE clone() const;
@@ -270,11 +277,68 @@ DECLARE_CLASS(TRE)
      * \param forceUpdate If true, recalculate the number and positions
      *                    of the TRE fields. See `updateFields()`
      */
+
+    // TRE fields use some of the "field" infrastructure, but have their own API.
+
+    void setFieldValue(const std::string& tag, const std::string& value, bool forceUpdate);
+    void setFieldValue(const std::string & tag, const char* value, bool forceUpdate);
+    void setFieldValue(const std::string& tag, const void* data, size_t dataLength, bool forceUpdate);
+
+    // This is wrong when T is "const char*" and the field is NITF_BINARY; sizeof(T) won't make sense.
+    // That's why there is a "const char*" overload above.
+    private:
+        template<typename T> struct can_call_setFieldValue : std::integral_constant<bool,
+            std::is_trivially_copyable<T>::value &&
+            !std::is_pointer<T>::value && !std::is_array<T>::value> {};
+    public:
+        template <typename T>
+        void setFieldValue(const std::string& tag, const T& value, bool forceUpdate)
+        {
+            const auto& field = nitf_TRE_getField(tag);
+            if (field.type == NITF_BINARY)
+            {
+                // In the C code, this is a call to memcpy(). be sure that is OK for T.
+                static_assert(can_call_setFieldValue<T>::value, "Can't use memcpy() with T.");
+                setFieldValue(tag, &value, sizeof(value), forceUpdate);
+            }
+            else
+            {
+                setFieldValue(field, tag, str::toString(value), forceUpdate);
+            }
+        }
+    // TODO: add overloads for e.g., std::vector<T> ???
+    //template <typename T>
+    //void setFieldValue(const std::string& tag, const std::vector<T>& value, bool forceUpdate)
+
     template <typename T>
-    void setField(std::string key, T value, bool forceUpdate = false)
+    void setField(const std::string& tag, const T& value, bool forceUpdate = false)
+    {
+        setFieldValue(tag, value, forceUpdate);
+    }
+    void setField(const std::string& tag, const void* data, size_t dataLength, bool forceUpdate = false)
+    {
+        setFieldValue(tag, data, dataLength, forceUpdate);
+    }
+
+    template<typename T>
+    const T& getFieldValue(const std::string& tag, T& value) const
     {
-        setField(key, str::toString(value), &value, sizeof(value), forceUpdate);
+        value = static_cast<T>(getField(tag));
+        return value;
     }
+    const std::string& getFieldValue(const std::string& tag, std::string& value, bool trim = false) const
+    {
+        value = getField(tag).toString(trim);
+        return value;
+    }
+    template<typename T>
+    const T getFieldValue(const std::string& tag) const
+    {
+        T retval;
+        getFieldValue(tag, retval);
+        return retval;
+    }
+
 
     /*!
      *  Does the field exist?
@@ -305,4 +369,4 @@ DECLARE_CLASS(TRE)
     mutable nitf_Error error{};
 };
 }
-#endif
+#endif // NITF_TRE_hpp_INCLUDED_
diff --git a/externals/nitro/modules/c++/nitf/source/ImageReader.cpp b/externals/nitro/modules/c++/nitf/source/ImageReader.cpp
index 32fe77ee0..5b02f8746 100644
--- a/externals/nitro/modules/c++/nitf/source/ImageReader.cpp
+++ b/externals/nitro/modules/c++/nitf/source/ImageReader.cpp
@@ -81,7 +81,7 @@ void ImageReader::setReadCaching()
     nitf_ImageReader_setReadCaching(getNativeOrThrow());
 }
 
-BufferList<std::byte> ImageReader::read(const nitf::SubWindow& window, size_t nbpp)
+BufferList<std::byte> ImageReader::read(const nitf::SubWindow& window, size_t /*nbpp*/)
 {
     // see py_ImageReader_read() and doRead() in test_buffered_read.cpp
 
diff --git a/externals/nitro/modules/c++/nitf/source/TRE.cpp b/externals/nitro/modules/c++/nitf/source/TRE.cpp
index f8ce52b7f..9b10e5f09 100644
--- a/externals/nitro/modules/c++/nitf/source/TRE.cpp
+++ b/externals/nitro/modules/c++/nitf/source/TRE.cpp
@@ -93,7 +93,7 @@ TRE::Iterator TRE::end() const noexcept
 
 nitf::Field TRE::getField(const std::string& key) const
 {
-    nitf_Field* field = nitf_TRE_getField(getNativeOrThrow(), key.c_str());
+    nitf_Field* field = ::nitf_TRE_getField(getNativeOrThrow(), key.c_str());
     if (!field)
         throw except::NoSuchKeyException(
                 Ctxt(FmtX("Field does not exist in TRE: %s", key.c_str())));
@@ -165,7 +165,7 @@ static bool endsWith(const std::string& s, const std::string& match) noexcept
     return sLen >= mLen;
 }
 
-std::string TRE::truncate(const std::string& value, size_t maxDigits) const
+std::string TRE::truncate(const std::string& value, size_t maxDigits) const 
 {
     const size_t decimalIndex = value.find('.');
     if (decimalIndex == std::string::npos)
@@ -185,57 +185,58 @@ std::string TRE::truncate(const std::string& value, size_t maxDigits) const
     return value;
 }
 
-static NITF_BOOL TRE_setField(nitf_TRE* tre,
-    const std::string& tag,
-    const NITF_DATA* data,
-    size_t dataLength, nitf_Error& error) noexcept
+void TRE::setFieldValue(const std::string& key, const void* data, size_t dataLength, bool forceUpdate)
 {
-    return nitf_TRE_setField(tre, tag.c_str(), data, dataLength, &error);
-}
-static NITF_BOOL TRE_setField(nitf_TRE* tre,
-    const std::string& tag,
-    const std::string& data,
-    nitf_Error& error) noexcept
-{
-    return TRE_setField(tre, tag, data.c_str(), data.size(), error);
-}
+    if (!nitf_TRE_setField(getNative(), key.c_str(), data, dataLength, &error))
+    {
+        throw NITFException(&error);
+    }
 
-void TRE::setField(const std::string& key, const std::string& strValue, NITF_DATA* data, size_t dataLength, bool forceUpdate)
-{
-    const nitf_Field* const field = nitf_TRE_getField(getNative(), key.c_str());
-    if (!field)
+    if (forceUpdate)
     {
-        std::ostringstream msg;
-        msg << key << " is not a recognized field for this TRE";
-        throw except::Exception(Ctxt(msg.str()));
+        updateFields();
     }
-    if (field->type == NITF_BINARY)
+}
+void TRE::setFieldValue(const nitf_Field& field, const std::string& key, const std::string& data, bool forceUpdate)
+{
+    if (field.type == NITF_BINARY)
     {
-        if (!TRE_setField(getNative(),
-            key,
-            data, dataLength,
-            error))
-        {
-            throw NITFException(&error);
-        }
+        // this mostly matches existing code ... except for NOT calling sizeof(std::string)
+        setFieldValue(key, data.c_str(), data.size(), forceUpdate);
     }
     else
     {
-        std::string s = truncate(strValue, field->length);
-        if (!TRE_setField(getNative(),
-            key,
-            s,
-            error))
-        {
-            throw NITFException(&error);
-        }
+        // call truncate() first
+        const auto s = truncate(data, field.length);
+        setFieldValue(key, s.c_str(), s.size(), forceUpdate);
     }
+}
 
-    if (forceUpdate)
+nitf_Field& TRE::nitf_TRE_getField(const std::string& tag) const
+{
+    auto const field = ::nitf_TRE_getField(getNative(), tag.c_str());
+    if (field == nullptr)
     {
-        updateFields();
+        std::ostringstream msg;
+        msg << tag << " is not a recognized field for this TRE";
+        throw except::Exception(Ctxt(msg.str()));
     }
+    return *field;
+}
 
+void TRE::setFieldValue(const std::string& tag, const std::string& data, bool forceUpdate)
+{
+    const auto& field = nitf_TRE_getField(tag);
+    setFieldValue(field, tag, data, forceUpdate);
+}
+void TRE::setFieldValue(const std::string& key, const char* data, bool forceUpdate)
+{
+    setFieldValue(key, data, strlen(data), forceUpdate);
+}
+
+bool TRE::setFieldValue(nitf_TRE* tre, const std::string& tag, const std::string& data, nitf_Error& error) noexcept
+{
+    return nitf_TRE_setField(tre, tag.c_str(), data.c_str(), data.length(), &error) ? true : false;
 }
 
 nitf_TRE* TRE::create(const std::string& tag, const std::string& id, nitf_Error& error) noexcept
@@ -244,7 +245,4 @@ nitf_TRE* TRE::create(const std::string& tag, const std::string& id, nitf_Error&
     return nitf_TRE_construct(tag.c_str(), pId, &error);
 }
 
-bool TRE::setField(nitf_TRE* tre, const std::string& tag, const std::string& data, nitf_Error& error) noexcept
-{
-    return TRE_setField(tre, tag, data, error);
-}
+
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 620269954..3c7572262 100644
--- a/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp
+++ b/externals/nitro/modules/c++/nitf/unittests/test_load_plugins.cpp
@@ -54,7 +54,7 @@ static const std::vector<std::string> all_plugins
 {
 #if _MSC_VER && NITRO_PCH
     // only build a handful in Visual Studio
-    "ACCHZB", "ACCPOB", "ACFTA", "AIMIDB", "CSCRNA", "HISTOA", "JITCID", "PTPRAA", "RPFHDR",
+    "ACCHZB", "ACCPOB", "ACFTA", "AIMIDB", "CSCRNA", "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",
@@ -83,6 +83,10 @@ TEST_CASE(test_load_PTPRAA)
 {
     load_plugin("PTPRAA");
 }
+TEST_CASE(test_load_ENGRDA)
+{
+    load_plugin("ENGRDA");
+}
 
 TEST_CASE(test_load_all_plugins)
 {
@@ -102,6 +106,7 @@ TEST_MAIN(
     (void)argc;
     (void)argv;
     TEST_CHECK(test_load_PTPRAA);
+    TEST_CHECK(test_load_ENGRDA);
     TEST_CHECK(test_load_all_plugins_C);
     TEST_CHECK(test_load_all_plugins);
 )
\ No newline at end of file
diff --git a/externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp b/externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp
index f3f699484..171d68542 100644
--- a/externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp
+++ b/externals/nitro/modules/c++/nitf/unittests/test_tre_mods++.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <iostream>
+#include <vector>
 
 #include <nitf/TRE.hpp>
 
@@ -98,6 +99,28 @@ TEST_CASE(basicIteration)
     TEST_ASSERT_EQ(numFields, 29);
 }
 
+TEST_CASE(basicIteration_ENGRDA)
+{
+    nitf::TRE engrda("ENGRDA", "ENGRDA");
+
+    engrda.setField("RESRC", "HSS");
+    engrda.setField("RECNT", 1, true /*forceUpdate*/);
+
+    // From ENGRDA.c
+    ///* This one we don't know the length of, so we have to use the special length tag */
+    ///* Notice that we use postfix notation to compute the length
+    // * We also don't know the type of data (it depends on ENGDTS), so
+    // * we need to override the TREHandler's read method.  If we don't do
+    // * this, not only will the field type potentially be wrong, but
+    // * strings will be endian swapped if they're of length 2 or 4. */
+    //{NITF_BINARY, NITF_TRE_CONDITIONAL_LENGTH, "Engineering Data",
+    //    "ENGDATA", "ENGDATC ENGDTS *"},
+    engrda.setField("ENGDTS[0]", 3); // size
+    engrda.setField("ENGDATC[0]", 1); // count
+    engrda.updateFields();
+    engrda.setField("ENGDATA[0]", "ABC");
+}
+
 TEST_CASE(populateWhileIterating)
 {
     nitf::TRE tre("ACCPOB");
@@ -130,6 +153,9 @@ TEST_CASE(overflowingNumericFields)
     // truncated
     tre.setField("ULCNR_LAT", 1.0 / 9);
     TEST_ASSERT_EQ(tre.getField("ULCNR_LAT").toString(), "0.1111111");
+    TEST_ASSERT_EQ(tre.getFieldValue<std::string>("ULCNR_LAT"), "0.1111111");
+    std::string value;
+    TEST_ASSERT_EQ(tre.getFieldValue("ULCNR_LAT", value), "0.1111111");
 
     tre.setField("ULCNR_LAT", 123456789);
     TEST_ASSERT_EQ(tre.getField("ULCNR_LAT").toString(), "123456789");
@@ -154,6 +180,7 @@ TEST_MAIN(
     TEST_CHECK(setBinaryFields);
     TEST_CHECK(cloneTRE);
     TEST_CHECK(basicIteration);
+    TEST_CHECK(basicIteration_ENGRDA);
     TEST_CHECK(populateWhileIterating);
     TEST_CHECK(overflowingNumericFields);
     )