Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 1a2fb322ee6e9d508f1a17befad601af33999d71
Author: Dan Smith <[email protected]>
Date:   Mon Nov 8 10:50:59 2021 -0500

    save_image() to help the compiler with overloading

commit f0c89b402545af8075a577dfdb1b4d33769833e7
Author: Dan Smith <[email protected]>
Date:   Mon Nov 8 10:31:13 2021 -0500

    begin reducning NITFWriteControl::save() overloads to help the compiler

commit 6d61083f61be8e31fcc8184ee1c1500dc1d5748d
Author: Dan Smith <[email protected]>
Date:   Mon Nov 8 10:06:56 2021 -0500

    Squashed commit of the following:

    commit a80a715c4dcf2c1f8ff9da8c90fc52d40c25bc61
    Author: Dan Smith <[email protected]>
    Date:   Fri Nov 5 09:29:24 2021 -0400

        fix another ICC compiler error (from high-side)

    commit e341b8e221f07831d19b7cbe83d07b5dbd2e414e
    Author: Dan Smith <[email protected]>
    Date:   Thu Nov 4 17:16:22 2021 -0400

        mem::ScopedArray<T> -> std::unique_ptr<T[]>

    commit 9edba14df70d186aa0df696c5f8dc825a6a81972
    Author: Dan Smith <[email protected]>
    Date:   Thu Nov 4 16:47:22 2021 -0400

        sys::Uint32_T -> uint32_t

    commit dce2a7df6dce586a413df75f2dd9c3f2c0cf7d2d
    Author: Dan Smith <[email protected]>
    Date:   Thu Nov 4 15:40:13 2021 -0400

        reduce use of explicit "new"

    commit da788ab6811933b000909b20bd1c181326abbe36
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 16:36:55 2021 -0400

        build Logger.cpp w/CMake

    commit f8ab35df28ef3b1248968222f0faddf36531181e
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 16:28:49 2021 -0400

        switch remaining code to new six::Logger infrastructure

    commit 11e66dc5dc15236ef28873ad96d3babfcb89d632
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 16:10:19 2021 -0400

        fix G++ compiler errors

    commit 396b4fa29c53b060bd40e2ea5f489fbf8770327d
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 16:00:31 2021 -0400

        simplify six::Logger

    commit 905f7f551f8d49be7415698a56e3f8472657ad72
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 14:43:09 2021 -0400

        more use of six::Logger to reduce boilerplate code

    commit b9368a9a0c7d1276e583cb525aa6d4f5b7027beb
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 14:07:23 2021 -0400

        more use of six::Logger to manage logging

    commit 82db8c136a4eee98e96493b0a90df38e059ea8b7
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 14:00:22 2021 -0400

        use the new six::Logger class to reduce boilerplate logger code

    commit f18fbe48e01960d07ec33cf034188b2aba88dbb7
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 12:18:45 2021 -0400

        use new Logger class to reduce boiler-plate code

    commit 3c74dbd5ee170e8401d7b8634d2590a370cbdd73
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 12:00:21 2021 -0400

        new Logger class to more easily manage logging configuration

    commit 5787a6909bfe9f88a099ed536837ca5a436c3421
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 11:24:06 2021 -0400

        use a std::unique_ptr for storing an "owned" logger

    commit 8fdb3e38417c429c4ad06f65947812fd0ac78c76
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 3 09:45:55 2021 -0400

        use std::make_unique() instead of explicit "new"

    commit e7938bc92bcedbcebc64ea8b0b3e4cd674aa248a
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 2 17:18:06 2021 -0400

        reduce use of explicit "new"

    commit 75ea632f815e4f04f90e606a409915bc5d18607d
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 2 16:14:04 2021 -0400

        version -> strVersion to avoid conflicting with global "version"

    commit dbc48b8ddaaae2029112860d418a23ba668df22c
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 2 15:53:33 2021 -0400

        another "version" -> "strVersion"; added unit-test

    commit 49048ae809c07219544b015513b46b375e004eb6
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 2 14:38:19 2021 -0400

        reduce use of explicit "new" and pointers in CPHDReader

    commit ce0db35d80dcd00200bc464ad4df113cfe9f9db2
    Merge: 895439562 80f110c09
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 2 12:02:04 2021 -0400

        Merge branch 'master' into develop/use_c++11

    commit 89543956292a2deff4b239b1dfea2e5d449f8fac
    Merge: 555055e55 6d69985fc
    Author: Dan Smith <[email protected]>
    Date:   Sat Feb 20 15:27:18 2021 -0500

        Merge branch 'develop/use_c++11' of github.com:ngageoint/six-library into develop/use_c++11

    commit 6d69985fce62ef2277a3b65c8bd5c04da9d5250b
    Author: Dan Smith <[email protected]>
    Date:   Wed Feb 17 10:42:22 2021 -0500

        turn off some CA diagnostics from other code

    commit 87623bb27d6a2c7ee7592469fd7be61027131aee
    Merge: b72de0b78 38909c4c6
    Author: Dan Smith <[email protected]>
    Date:   Wed Feb 17 09:30:38 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 555055e55d899269ff7e9041ab5111ee3d864a2b
    Merge: 809f99884 38909c4c6
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 15 17:52:03 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 809f99884740d51a082c3f98e76a9998492c3ac1
    Merge: a0ec957bd 1327e071a
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 15 15:13:44 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit b72de0b7899d9d4fda67953b24e9d6b36d5bc8de
    Merge: a0ec957bd 1327e071a
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 15 15:03:46 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit a0ec957bdcaee57e4058fac4bd7ee9926935cc8d
    Author: Dan Smith <[email protected]>
    Date:   Wed Feb 10 09:52:44 2021 -0500

        old compilers don't like certain kinds of braced-initialization

    commit 7bc8624a0068abba75379786754f133eac8447e7
    Merge: 7eb4f3f1a 32575e474
    Author: Dan Smith <[email protected]>
    Date:   Wed Feb 10 09:46:24 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 7eb4f3f1ad7cb47b83bff656b366fa10f8baef69
    Merge: 91f6c481e 0abd4e691
    Author: Dan Smith <[email protected]>
    Date:   Tue Feb 9 17:13:03 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 91f6c481e86cae6c8ba52a7cce84e4577ac0600c
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 1 16:27:36 2021 -0500

        std::auto_ptr -> mem::auto_ptr for C++17

    commit d0cf3be40fbb6018274d890e3f5d5f81680cd38f
    Merge: d165f6252 0892e19a7
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 1 16:13:39 2021 -0500

        Merge branch 'develop/use_c++11' of github.com:ngageoint/six-library into develop/use_c++11

    commit d165f62522c366f161fbd62c6cbe1e5a91c24dd4
    Merge: 09450c25f c5f669c79
    Author: Dan Smith <[email protected]>
    Date:   Mon Feb 1 16:12:54 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 0892e19a7a39c2284185384f30d98951eb1f3758
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 27 16:38:03 2021 -0500

        fix a few more errors with building with C++17

    commit afaf4d4e778a83160b5a5001d90686270abdf086
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 27 15:53:23 2021 -0500

        mem::auto_ptr instead of std::auto_ptr for C++17

    commit 67b41f90e1a36c2f40357d7c2ae39e2620886970
    Merge: 4bcd2a70a d22cdb99a
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 27 15:24:35 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 4bcd2a70aadc6b488334192fe1ba1954813fe6cc
    Merge: 9c6b41ded 652dadf7b
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 27 15:24:30 2021 -0500

        Merge branch 'develop/use_c++11' of github.com:ngageoint/six-library into develop/use_c++11

    commit 09450c25fcd36c2fba0dabc08059f745e106d28c
    Merge: 652dadf7b 5d81778ca
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 26 08:43:02 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 652dadf7be1d87abdc39abda397633c77226051d
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 25 18:08:10 2021 -0500

        no std::auto_ptr in C++17

    commit 7bb1bb44bc768645c64d8e2d2a2b621b4ff65526
    Merge: e76c3654c c1cf6e7b3
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 25 18:00:56 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit e76c3654c671a011d1d43e762322fc5fe62be0de
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 25 17:59:45 2021 -0500

        no auto_ptr in C++17

    commit b7413c6b113220ae9d90a7fbe4f95eb5439b8cf2
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 20 10:23:48 2021 -0500

        do a better job of being sure we have additional stuff in "std" from coda-oss

    commit fb5176c6a3cd7de039f5a28225717e2f0ff102ad
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 20 08:57:57 2021 -0500

        #include <scene/sys_Conf.h> rather than <nitf/coda-oss.hpp>

    commit df90a441363a1aa8c5800e6e46b2c8b19e676d2a
    Merge: 160f01ec3 74727d411
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 20 08:43:06 2021 -0500

        Merge branch 'master' into develop/use_c++11

    commit 160f01ec3457c6af580e862cb30508c11089f922
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 20 08:42:36 2021 -0500

        #define CODA_OSS_AUGMENT_std_namespace before #include <sys/Conf.h>

    commit a01559531bc0ca915e09ca63953f592ee1b48f95
    Merge: bd7d9f7b9 0ecff9559
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 18:01:33 2021 -0500

        Merge branch 'develop/update_externals' into develop/use_c++11

    commit 0ecff955987475619e5756b30bbe1e38add907fa
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 17:59:47 2021 -0500

        remove files that shouldn't have been committed

    commit bd7d9f7b90840e883588bf0aafd446a6a1bdec38
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 17:49:29 2021 -0500

        #include <nitf/coda-oss.hpp> instead of sys/Conf.h to get stuff added to "std"

    commit 671a89a17a8c7e818e51f0b8ac260d3cbd50b35f
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 17:28:27 2021 -0500

        trigger build on GitHub

    commit 460a96b3819c150608ca6e28cf51234b53c7299e
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 17:14:26 2021 -0500

        didn't want this change

    commit 0ec8633e6f1f16384e08fb0f54fc463c05c5a0a7
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 17:11:15 2021 -0500

        get #includes right for PCH

    commit 824284722ce0a6b80cdbc6c76d9414032b27da45
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 16:55:58 2021 -0500

        gsl::span -> std::span

    commit 70a3e7282bc4359f6edbc2df52c77e11df523b1b
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 16:50:53 2021 -0500

        these are the correct files from "master"

    commit b856b5451289a0ad6bab254dd2a2d6f14aee571d
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 19 16:44:25 2021 -0500

        latest from coda-oss and nitro

    commit fa0a138472ae143518bad1eb9d608152d32dbe22
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    Date:   Tue Jan 19 16:32:43 2021 -0500

        Merge branch 'master' into develop/update_externals

    commit c10f2332c3650969a770c71ee830569911b9d13a
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 15:08:25 2021 -0500

        std::span -> gsl::span

    commit 9e218034c4ecdac44392473ee8f385a25a56f3c5
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 14:49:00 2021 -0500

        need to redo C++17 support

    commit e21d4fcf730005f605df2d345f62e4f2399a14ca
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 14:48:25 2021 -0500

        paths are wrong in "externals"

    commit 1083ac1a6cc8879d2b1c9949602321197cec4ecc
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 13:52:32 2021 -0500

        latest from "nitro"

    commit 6fca2584d08b2d03374450a60d64c7086c23d568
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 12:20:13 2021 -0500

        lates from coda-oss/main

    commit 1073b397a60a3a5357c5b433409dd6447b773273
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 16 11:41:11 2021 -0500

        add back "java" and "mex"

    commit 6de2fa0d43d9d40078b0c268ac3fdeb78ae7aa39
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 13 10:22:13 2021 -0500

        merge brought back a deleted #include

    commit 4e23991f609f2ec430a57539f80c27561abb28c8
    Merge: ebe95509a 436986f87
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 13 10:18:55 2021 -0500

        Merge branch 'develop/update_externals' into main

    commit ebe95509a01652e16d9fc9ac8869834bd2cf60a2
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 13 10:18:01 2021 -0500

        slam in externals as merging creates too many conflicts

    commit 436986f87f612e10ada1cce884a4519daa022a5d
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Wed Jan 13 08:52:28 2021 -0500

        paths are wrong in "externals"

    commit da30b960bb2a2af6c4580c49cae6740588703653
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 13 08:27:21 2021 -0500

        remove "nitro" files not needed in externals/nitro

    commit 120ee00fad22e0d6713184eb8f6660d97b76b721
    Author: Dan Smith <[email protected]>
    Date:   Wed Jan 13 08:25:11 2021 -0500

        fix missing #include file

    commit fa1990597c9e08a30e110e5710ec0177d6aabfdf
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:55:17 2021 -0500

        need to redo C++17

    commit 1bd0cb3a8df08c6304bea6ff3a187a2847ad37df
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:50:53 2021 -0500

        std::span removed from "nitro"

    commit 4e6a7528b5888b965522f5e80d7279a36206aee8
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:30:47 2021 -0500

        latest from nitro/main

    commit 99a0a01cb852152021c61696fb9b83bdab425004
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:28:13 2021 -0500

        adjust coda-oss for our usage

    commit 65026c2702081ae9cd59f676a30934564148983b
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:26:59 2021 -0500

        latest from coda-oss/main

    commit e6a58a2be5b66ba52b7a3747e7325acaa84276a9
    Author: Dan Smith <[email protected]>
    Date:   Tue Jan 12 17:24:02 2021 -0500

        slam in "main"

    commit 92d5bb5ca0afce00012f8892494ef41516dc4df7
    Merge: 7b8ca7066 5e5870f6b
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    Date:   Mon Jan 11 18:17:11 2021 -0500

        remove externals/nitro/docs

    commit 5e5870f6b9b1d38596e6be22ab89e07def076e68
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 18:05:56 2021 -0500

        paths are wrong when in "externals"

    commit d9a5c2ff8923a322760393632391c50ed793510b
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 17:42:08 2021 -0500

        more changes from nitro/modules/c++

    commit 7aba3b8d9a1add0317b14de33b7717a8565a0b39
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 17:19:54 2021 -0500

        fix IOStreamWriter ctor

    commit 84db123c433ef5d2ade3ad712369e23c8af8dbe8
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 17:13:14 2021 -0500

        more changes from nitro/modules/c++

    commit a6880924fe205acb4faa8ca7943cf0c84d3d59e9
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 16:48:00 2021 -0500

        fix build error on Linux

    commit 7a9b240ec9a313c8eb699c81dbc2742bb88fb8b4
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 15:10:45 2021 -0500

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

    commit a398eefa2e2ce746becee4d72dbd7c8add57c8be
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 14:48:32 2021 -0500

        VCXPROJ files from nitro

    commit b3c1dbd794849177d6416a34379987996d4e019e
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 14:26:17 2021 -0500

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

    commit 8fe3028cc3b051075b760fdd95b2562b7ec9734b
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 13:48:24 2021 -0500

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

    commit e82f28cd40d9e4e3029085b23048ba6c4d9c7a29
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 13:31:22 2021 -0500

        update externals/nitro/docs

    commit 89522fe0f8200111a6ea860927903f38a9021727
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 13:19:38 2021 -0500

        Revert "latest from nitro/master"

        This reverts commit e89da71da0a7f494ee6e79a92f3828d8079c1c4d.

    commit 3adb502a17a1bda89372b235e18388197a9eaf4f
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 13:19:24 2021 -0500

        ignore build/ directory

    commit e89da71da0a7f494ee6e79a92f3828d8079c1c4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 12:14:31 2021 -0500

        latest from nitro/master

    commit db45e1e2f214df8ab417ddde0875593f0bba537b
    Author: Dan Smith <[email protected]>
    Date:   Mon Jan 11 09:11:16 2021 -0500

        Revert "latest from "nitro""

        This reverts commit 0b99300f7c181eb073a86239444d30bc0acf7fa4.

    commit 0b99300f7c181eb073a86239444d30bc0acf7fa4
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 9 18:02:30 2021 -0500

        latest from "nitro"

    commit ae630e65c608257650c70735d5062db7e5e2dcc2
    Author: Dan Smith <[email protected]>
    Date:   Sat Jan 9 17:33:00 2021 -0500

        update externals/nitro/docs

    commit f283be39d553aafad0f3132e2277038eaa4b515c
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 9c6b41ded7392ca1048fab5dce13878255340afe
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 15:52:14 2020 -0500

        NULL -> nullptr

    commit 6e673a45bd7e223496a49ccac54f912a1bece4bf
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 15:13:42 2020 -0500

        less use of sys::

    commit 690ed8f54e6c88c47a8a90d1d09eef0014977e02
    Merge: e8f8bd12f ef45d66b7
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 14:02:48 2020 -0500

        Merge branch 'main' into develop/use_c++11

    commit e8f8bd12fcef2d7db3227ddb18017c92780aafa2
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 13:21:05 2020 -0500

        use filesystem::path and std::endian

    commit ef45d66b7ce27551cb9d96555da353ef266c9e9b
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 1ba1665394b73b70d2857cc0310d9b08866009e5
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 11:43:03 2020 -0500

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

    commit 42a4e29076885ca6814a1937ca12eccf0759863e
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 11:03:54 2020 -0500

        Revert "sys::Off_T -> ptrdiff_t"

        This reverts commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2.

    commit aa22a370bb02574640cf7c0b2bc20bdd4fd2add2
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 10:35:46 2020 -0500

        sys::Off_T -> ptrdiff_t

    commit 4a46f6c4176790564ef29f7a2312a660a1601dd1
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 10:25:44 2020 -0500

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

    commit d7bd7902d36cecd670bff9d73b7880fcdada730f
    Merge: 5d3b4bc57 48deaeb01
    Author: Dan Smith <[email protected]>
    Date:   Sat Dec 5 10:06:09 2020 -0500

        Merge branch 'main' into develop/use_c++11

    commit 48deaeb01376d88956a1b84097ae953c2e939c85
    Author: J. Daniel Smith <[email protected]>
    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 5d3b4bc573aea68f1e084fe4f7e831bbd4af3298
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 14:45:15 2020 -0500

        build with std::byte

    commit 36535d9694198483f8621fd4ad4b26eb52a2965f
    Merge: af38657ed b03c97994
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 14:19:37 2020 -0500

        Merge branch 'main' into develop/use_c++11

    commit af38657ed6ddf381668f875a480ae1ff26a569e7
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 14:17:28 2020 -0500

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

    commit 7b884915653736b15ec5e1377d86f1b891c5cbf7
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 11:53:22 2020 -0500

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

    commit 400ab90328b0e2e1d567c572256b61119d2ee5d1
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 11:33:53 2020 -0500

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

    commit b03c97994b65dad3e5fe5af14be3dc43379423f3
    Author: J. Daniel Smith <[email protected]>
    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 403b5a2a44e858bcc741d48a5bee583658bffacb
    Merge: acb882d22 472cd0bba
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 09:51:14 2020 -0500

        Merge branch 'develop/update_externals' into develop/use_c++11

    commit 472cd0bba0945a819a2baf188992da8a5f2890e0
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 2 09:50:47 2020 -0500

        update "nitro" to get SegmentMemorySource overloads

    commit acb882d2205e587195a28f020ac5aaae4e6c8483
    Merge: d9e7b59ea f1b6d2255
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 18:05:24 2020 -0500

        Merge branch 'main' into develop/use_c++11

    commit f1b6d2255807c658c55a83232cd3e8b40a59348b
    Author: J. Daniel Smith <[email protected]>
    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 b445329f15a1099020801ad86377a92e9b2f89c7
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 17:31:43 2020 -0500

        unit-test paths are wrong for "externals"

    commit d9e7b59eacb462868947530fc452a1143ed6806e
    Merge: 2c86f4e88 a0f918549
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 16:23:45 2020 -0500

        Merge branch 'develop/update_externals' into develop/use_c++11

    commit a0f918549b4e20eb6d46c5804e4c1dac68abfa6a
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 16:23:19 2020 -0500

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

    commit 2c86f4e8862bd43a5635bfb94153dd7a5f14c613
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 15:28:57 2020 -0500

        mem::SharedPtr -> std::shared_ptr

    commit 0e60d325e19326960a44f2d1b650c2a0a8db40db
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 14:47:32 2020 -0500

        use int64_t, etc. instead of sys::Int64_T

    commit 4ac10f90a1a646d134c4ab560ada1c61d414b8c2
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 13:52:22 2020 -0500

        update coda-oss and fix compiler errors

    commit 0eae36ff04134871d58a36023ab107901e9e8734
    Author: Dan Smith <[email protected]>
    Date:   Tue Dec 1 13:31:23 2020 -0500

        update "nitro"

    commit 4538574440414f950dd454424ee00ee15754fe0e
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Mon Nov 9 14:51:12 2020 -0500

        use .tar, not .tar.gz

    commit f9283e8b6eb56a2ca4fb193964240087a8c1ce7d
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Wed Nov 4 09:35:45 2020 -0500

        Merge branch 'develop/update_externals' into main

    commit 90e42da6b5a3c2cb23e2183bbd5afc46b1785507
    Author: Dan Smith <[email protected]>
    Date:   Wed Nov 4 09:34:33 2020 -0500

        use sys::Filesystem

    commit f014cf4b86e62d26971e458af52d5e28f183ea6d
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 3 18:27:23 2020 -0500

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

    commit 950668d00022199c0c5e4a60f6ee0a1524c92fbc
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    Date:   Tue Nov 3 15:30:24 2020 -0500

        latest from "main" on coda-oss

    commit 70d253c1f34df1bd79aca35737e9fc60ab97cc61
    Merge: f332607bf 3a042b670
    Author: Dan Smith <[email protected]>
    Date:   Tue Nov 3 15:24:47 2020 -0500

        Merge branch 'main' into develop/update_externals

    commit 3a042b6707eef97a43b508513ed11ca7f7bc0f2a
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    Date:   Mon Nov 2 15:41:41 2020 -0500

        latest from coda-oss

    commit 5c48090a2dbb0c665a12f45cf126329395fcb0c4
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    Date:   Mon Oct 26 17:28:09 2020 -0400

        latest from coda-oss

    commit f71c7eda1610f1dc5f9668c541c8cd925fd3c963
    Merge: d3423b3b8 404dadcd2
    Author: Dan Smith <[email protected]>
    Date:   Mon Oct 26 17:26:57 2020 -0400

        Merge branch 'main' into develop/update_externals

    commit 404dadcd26851a243332d8263e57230687bad231
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    Date:   Mon Oct 26 14:57:51 2020 -0400

        latest from coda-oss

    commit 18613b5bfb2e988e1c809a3df774e6335a5537b9
    Merge: 8ff24519e 21a550c5a
    Author: Dan Smith <[email protected]>
    Date:   Mon Oct 26 14:48:50 2020 -0400

        Merge branch 'main' into develop/update_externals

    commit 21a550c5aca6c0c2f0d9cb9112be3f8f84c54cdb
    Author: J. Daniel Smith <[email protected]>
    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 <[email protected]>
    Date:   Mon Oct 26 12:12:01 2020 -0400

        restore changes lost in merge

    commit f996fa8e2f7c496b5526825695334e64fdbf66d9
    Merge: 1edffffdd fe9dffff6
    Author: Dan Smith <[email protected]>
    Date:   Mon Oct 26 11:47:16 2020 -0400

        Merge branch 'main' into develop/update_externals

    commit 1edffffddef9bdf94bd67a68aacfd03d5ee09cdd
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Wed Oct 21 13:43:18 2020 -0400

        one more coda-oss update

    commit 39344b1593c503a1b2c162dbf53b16ee7795dfa1
    Merge: 97ecde918 92af349d9
    Author: Dan Smith <[email protected]>
    Date:   Wed Oct 21 13:39:17 2020 -0400

        Merge branch 'main' into develop/update_externals

    commit 97ecde918cab214c3ec9666b05b9e809897c72fc
    Author: Dan Smith <[email protected]>
    Date:   Wed Oct 21 13:27:07 2020 -0400

        fix StringStream() .ctor()

    commit 2be4824922dee267a5d0244c90ef4fba70da461d
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Tue Oct 20 12:05:14 2020 -0400

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

    commit 495d74aef2a4dea3e2540eba436d84a157716db1
    Author: Dan Smith <[email protected]>
    Date:   Tue Oct 20 11:41:40 2020 -0400

        update coda-oss with latest from "main"

    commit d16b60da16d53960bb981514dd0dfc30c0233a44
    Merge: e8636f450 52207d7b3
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Sat Oct 17 16:44:46 2020 -0400

        build crop_sicd

    commit bb1dbe6018b5afaa8f6bded43bc995f9e0ce695f
    Author: Dan Smith <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    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 <[email protected]>
    Date:   Wed Oct 14 16:38:32 2020 -0400

        build with Visual Studio 2019 (#358)

        * Revert "Create codeq…
  • Loading branch information
Dan Smith committed Nov 9, 2021
1 parent 5854452 commit a216f6c
Show file tree
Hide file tree
Showing 65 changed files with 591 additions and 458 deletions.
19 changes: 9 additions & 10 deletions six/modules/c++/cphd/include/cphd/CPHDReader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ namespace cphd
* Requires a valid CPHD file,and optional schemas
* for XML format verification
*/
class CPHDReader
struct CPHDReader final
{
public:
/*
* \func CPHDReader constructor
* \brief Construct CPHDReader from an input stream
Expand Down Expand Up @@ -81,22 +80,22 @@ class CPHDReader
//! Get parameter functions
size_t getNumChannels() const
{
return mMetadata->data.getNumChannels();
return mMetadata.data.getNumChannels();
}
//! 0-based channel number
size_t getNumVectors(size_t channel) const
{
return mMetadata->data.getNumVectors(channel);
return mMetadata.data.getNumVectors(channel);
}
//! 0-based channel number
size_t getNumSamples(size_t channel) const
{
return mMetadata->data.getNumSamples(channel);
return mMetadata.data.getNumSamples(channel);
}
//! returns total per complex sample (2, 4, or 8)
size_t getNumBytesPerSample() const
{
return mMetadata->data.getNumBytesPerSample();
return mMetadata.data.getNumBytesPerSample();
}

/*
Expand All @@ -122,12 +121,12 @@ class CPHDReader
//! Get metadata object
const Metadata& getMetadata() const
{
return *mMetadata;
return mMetadata;
}
//! Get per vector parameters
const PVPBlock& getPVPBlock() const
{
return *mPVPBlock;
return mPVPBlock;
}
//! Get signal data
const Wideband& getWideband() const
Expand All @@ -145,11 +144,11 @@ class CPHDReader
//! New cphd file header
FileHeader mFileHeader;
//! Metadata read in from CPHD file
std::unique_ptr<Metadata> mMetadata;
Metadata mMetadata;
//! Support Block book-keeping info read in from CPHD file
std::unique_ptr<SupportBlock> mSupportBlock;
//! Per Vector Parameter info read in from CPHD file
std::unique_ptr<PVPBlock> mPVPBlock;
PVPBlock mPVPBlock;
//! Signal block book-keeping info read in from CPHD file
std::unique_ptr<Wideband> mWideband;

Expand Down
5 changes: 2 additions & 3 deletions six/modules/c++/cphd/include/cphd/CPHDWriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,8 @@ struct DataWriterLittleEndian final : public DataWriter


private:
// Size of scratch space
const size_t mScratchSize;
// Scratch space buffer
const std::unique_ptr<std::byte[]> mScratch;
std::vector<std::byte> mScratch;
};

/*
Expand Down Expand Up @@ -389,6 +387,7 @@ struct CPHDWriter

//! DataWriter object
std::unique_ptr<DataWriter> mDataWriter;
void initializeDataWriter();

// Book-keeping element
//! metadata information
Expand Down
25 changes: 20 additions & 5 deletions six/modules/c++/cphd/include/cphd/CPHDXMLControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@

#ifndef __CPHD_CPHD_XML_CONTROL_H__
#define __CPHD_CPHD_XML_CONTROL_H__
#pragma once

#include <memory>
#include <unordered_map>
#include <std/filesystem>
#include <vector>

#include <scene/sys_Conf.h>
#include <logging/Logger.h>
#include <xml/lite/Element.h>
#include <xml/lite/Document.h>
#include <cphd/CPHDXMLParser.h>
#include <cphd/Types.h>
#include <six/Logger.h>

namespace cphd
{
Expand All @@ -54,7 +57,7 @@ class CPHDXMLControl
CPHDXMLControl(logging::Logger* log = nullptr, bool ownLog = false);

//! Destructor
virtual ~CPHDXMLControl();
virtual ~CPHDXMLControl() = default;

/*
* \func setLogger
Expand All @@ -63,7 +66,15 @@ class CPHDXMLControl
* \param log provide logger object
* \param ownLog flag indicates if log should be deleted
*/
void setLogger(logging::Logger* log, bool ownLog = false);
template<typename TLogger>
void setLogger(TLogger&& logger)
{
mLogger.setLogger(std::forward<TLogger>(logger));
}
void setLogger(logging::Logger* logger, bool ownLog)
{
mLogger.setLogger(logger, ownLog);
}

/*!
* \func toXMLString
Expand Down Expand Up @@ -117,10 +128,14 @@ class CPHDXMLControl
virtual std::unique_ptr<Metadata> fromXML(
const xml::lite::Document* doc,
const std::vector<std::string>& schemaPaths = std::vector<std::string>());
virtual Metadata fromXML(const xml::lite::Document& doc,
const std::vector<std::filesystem::path>& schemaPaths = std::vector<std::filesystem::path>());


protected:
logging::Logger *mLog;
bool mOwnLog;
logging::Logger *mLog = nullptr;
bool mOwnLog = false;
six::Logger mLogger;

private:
//! \return Hardcoded version to uri mapping
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/cphd/include/cphd/Metadata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ namespace cphd
* This object contains all of the sub-blocks for CPHD.
*
*/
struct Metadata : MetadataBase
struct Metadata final : MetadataBase
{
//! Default constructor
//! Initializes CPHD version to default version specified in FileHeader
Expand Down
3 changes: 3 additions & 0 deletions six/modules/c++/cphd/include/cphd/PVPBlock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

namespace cphd
{
class FileHeader;
/*
* \struct AddedPVP
* \brief Template Specialization to get additional pvp
Expand Down Expand Up @@ -98,6 +99,7 @@ struct PVPBlock
* if provided number of bytes is not sufficient
*/
PVPBlock(const Pvp& pvp, const Data& data);
PVPBlock(const Metadata&);

/*!
* \func PVPBlock
Expand Down Expand Up @@ -323,6 +325,7 @@ struct PVPBlock
int64_t startPVP,
int64_t sizePVP,
size_t numThreads);
int64_t load(io::SeekableInputStream& inStream, const FileHeader&, size_t numThreads);

//! Equality operators
bool operator==(const PVPBlock& other) const
Expand Down
15 changes: 9 additions & 6 deletions six/modules/c++/cphd/include/cphd/SupportBlock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,17 @@

namespace cphd
{
class FileHeader;


/*
* \struct SupportBlock
*
* \brief This class contains information about the SupportBlock CPHD data.
*/
// Provides methods to read support block data from CPHD file/stream
class SupportBlock
struct SupportBlock final
{
public:
/*
* \func SupportBlock
*
Expand Down Expand Up @@ -80,6 +81,8 @@ class SupportBlock
const cphd::Data& data,
int64_t startSupport,
int64_t sizeSupport);
SupportBlock(std::shared_ptr<io::SeekableInputStream> inStream,
const cphd::Data& data, const FileHeader&);

// Noncopyable
SupportBlock(const SupportBlock&) = delete;
Expand Down Expand Up @@ -138,12 +141,12 @@ class SupportBlock
// Same as above but allocates the memory
void read(const std::string& id,
size_t numThreads,
mem::ScopedArray<sys::ubyte>& data) const;
std::unique_ptr<sys::ubyte[]>& data) const;
void read(const std::string& id,
size_t numThreads,
std::unique_ptr<std::byte[]>& data) const
{
mem::ScopedArray<sys::ubyte> data_;
std::unique_ptr<sys::ubyte[]> data_;
read(id, numThreads, data_);
data.reset(reinterpret_cast<std::byte*>(data_.release()));
}
Expand All @@ -161,11 +164,11 @@ class SupportBlock
*
*/
void readAll(size_t numThreads,
mem::ScopedArray<sys::ubyte>& data) const;
std::unique_ptr<sys::ubyte[]>& data) const;
void readAll(size_t numThreads,
std::unique_ptr<std::byte[]>& data) const
{
mem::ScopedArray<sys::ubyte> data_;
std::unique_ptr<sys::ubyte[]> data_;
readAll(numThreads, data_);
data.reset(reinterpret_cast<std::byte*>(data_.release()));
}
Expand Down
13 changes: 7 additions & 6 deletions six/modules/c++/cphd/include/cphd/Wideband.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@

namespace cphd
{
class FileHeader;

/*
* \class Wideband
* \brief Information about the wideband CPHD data
*/
// It contains the cphd::Data structure (for channel and vector sizes).
// Provides methods read wideband data from CPHD file/stream
class Wideband
struct Wideband final
{
public:
static const size_t ALL;

/*!
Expand Down Expand Up @@ -211,15 +212,15 @@ class Wideband
size_t firstSample,
size_t lastSample,
size_t numThreads,
mem::ScopedArray<sys::ubyte>& data) const;
std::unique_ptr<sys::ubyte[]>& data) const;
std::unique_ptr<std::byte[]>read(size_t channel,
size_t firstVector,
size_t lastVector,
size_t firstSample,
size_t lastSample,
size_t numThreads) const
{
mem::ScopedArray<sys::ubyte> data;
std::unique_ptr<sys::ubyte[]> data;
read(channel, firstVector, lastVector, firstSample, lastSample, numThreads, data);

return std::unique_ptr<std::byte[]>(reinterpret_cast<std::byte*>(data.release()));
Expand All @@ -238,10 +239,10 @@ class Wideband
* \throw except::Exception If BufferView memory allocated is insufficient
*/
// Same as above for compressed Signal Array
void read(size_t channel, mem::ScopedArray<sys::ubyte>& data) const;
void read(size_t channel, std::unique_ptr<sys::ubyte[]>& data) const;
void read(size_t channel, std::unique_ptr<std::byte[]>& data) const
{
mem::ScopedArray<sys::ubyte> data_;
std::unique_ptr<sys::ubyte[]> data_;
read(channel, data_);
data.reset(reinterpret_cast<std::byte*>(data_.release()));
}
Expand Down
15 changes: 7 additions & 8 deletions six/modules/c++/cphd/source/ByteSwap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cphd/ByteSwap.h>

#include <string>
#include <std/memory>

#include <sys/Conf.h>
#include <mt/ThreadPlanner.h>
Expand Down Expand Up @@ -195,13 +196,12 @@ void byteSwapAndPromote(const void* input,
startRow,
numRowsThisThread))
{
std::unique_ptr<sys::Runnable> scaler(
new ByteSwapAndPromoteRunnable<InT>(
auto scaler = std::make_unique<ByteSwapAndPromoteRunnable<InT>>(
input,
startRow,
numRowsThisThread,
dims.col,
output));
output);
threads.createThread(std::move(scaler));
}

Expand Down Expand Up @@ -233,13 +233,13 @@ void byteSwapAndScale(const void* input,
startRow,
numRowsThisThread))
{
std::unique_ptr<sys::Runnable> scaler(new ByteSwapAndScaleRunnable<InT>(
auto scaler = std::make_unique<ByteSwapAndScaleRunnable<InT>>(
input,
startRow,
numRowsThisThread,
dims.col,
scaleFactors,
output));
output);
threads.createThread(std::move(scaler));
}

Expand Down Expand Up @@ -273,12 +273,11 @@ void byteSwap(void* buffer,
startElement,
numElementsThisThread))
{
std::unique_ptr<sys::Runnable> thread(new ByteSwapRunnable(
auto thread = std::make_unique<ByteSwapRunnable>(
buffer,
elemSize,
startElement,
numElementsThisThread));

numElementsThisThread);
threads.createThread(std::move(thread));
}
threads.joinAll();
Expand Down
Loading

0 comments on commit a216f6c

Please sign in to comment.