latest changes for SICD 1.3

.gitignore

@@ -25,7 +25,8 @@ install/
 install.dbg/
 **/install-*/
 test_package/build/
-out/
+out/build/
+out/install/
 test_package/build/
 *.pyc
 *.swp
@@ -58,4 +59,3 @@ six/projects/csm/external/csm-master/
 # Giant test files
 regression_files/
 six/modules/c++/cphd/tests/sample_cphd/
-

UnitTest/UnitTest.vcxproj

@@ -98,6 +98,7 @@
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -152,6 +153,7 @@
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

externals/nitro/modules/c++/nitf-c++.vcxproj

@@ -180,7 +180,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{8F357A19-799E-4971-850E-3F28485C130B}</ProjectGuid>
     <RootNamespace>nitro</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>nitf-c++</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -233,6 +232,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <SupportJustMyCode>true</SupportJustMyCode>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -260,6 +260,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <WarningLevel>Level3</WarningLevel>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>

externals/nitro/modules/c/nitf-c.vcxproj

@@ -64,6 +64,7 @@
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <SupportJustMyCode>true</SupportJustMyCode>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -87,6 +88,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <WarningLevel>Level3</WarningLevel>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>

externals/nitro/modules/c/nitf/XML_DATA_CONTENT.vcxproj

@@ -23,7 +23,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{78849481-D356-4CC7-B182-31C21F857ED1}</ProjectGuid>
     <RootNamespace>nitro</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>XML_DATA_CONTENT</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -75,6 +74,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -96,6 +96,7 @@
       <CompileAs>CompileAsCpp</CompileAs>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>

six/modules/c++/cphd/unittests/test_pvp_block.cpp

@@ -22,6 +22,7 @@
 
 #include <complex>
 #include <thread>
+#include <tuple>
 
 #include <cphd/PVP.h>
 #include <cphd/PVPBlock.h>
@@ -36,6 +37,7 @@ static void call_srand()
 {
     const auto f = []() { ::srand(174); return nullptr; };
     static const auto result = f();
+    std::ignore = result;
 }
 
 void setVectorParameters(size_t channel,

six/modules/c++/cphd03/unittests/test_cphd_write.cpp

@@ -22,6 +22,7 @@
 
 #include <string>
 #include <std/filesystem>
+#include <tuple>
 
 #include <cphd03/CPHDWriter.h>
 #include <cphd03/CPHDReader.h>
@@ -41,6 +42,7 @@ static void call_srand()
 {
     static const auto f = []() { const auto seed = 334; ::srand(seed); return nullptr; };
     static const auto result = f();
+    std::ignore = result;
 }
 
 double round(double num, int places)

six/modules/c++/cphd03/unittests/test_vbm.cpp

@@ -21,6 +21,7 @@
  */
 
 #include <string>
+#include <tuple>
 
 #include <cphd03/VBM.h>
 #include <cphd/TestDataGenerator.h>
@@ -33,6 +34,7 @@ static void call_srand()
 {
     static const auto f = []() { constexpr auto seed = 174; ::srand(seed); return nullptr; };
     static const auto result = f();
+    std::ignore = result;
 }
 
 void testVectorParameters(const std::string& testName_,

six/modules/c++/nitro_pch.h

@@ -55,40 +55,8 @@
 #pragma comment(lib, "sys-c++")
 #pragma comment(lib, "str-c++")
 #pragma comment(lib, "logging-c++")
-#pragma comment(lib, "xml.lite-c++.lib")
-#pragma comment(lib, "xerces-c")
 #pragma comment(lib, "ws2_32")
 
-// these are from Xerces
-#pragma warning(disable: 5219) // implicit conversion from '...' to '...', possible loss of data
-#pragma warning(disable: 4365) // '...': conversion from '...' to '...', signed / unsigned mismatch
-#pragma warning(disable: 26477) // Use 'nullptr' rather than 0 or NULL (es.47).
-#pragma warning(disable: 26493) // Don't use C-style casts (type.4).
-#pragma warning(disable: 26814) // The const variable '...' can be computed at compile-time. Consider using constexpr (con.5).
-#pragma warning(disable: 26496) // The variable '...' does not change after construction, mark it as const (con.4).
-#pragma warning(disable: 26497) // The function '...' could be marked constexpr if compile-time evaluation is desired (f.4).
-#pragma warning(disable: 26475) // Do not use function style casts (es.49). Prefer '...' over '...'.
-#pragma warning(disable: 26495) // Variable '...' is uninitialized. Always initialize a member variable (type.6).
-#pragma warning(disable: 26461) // The pointer argument '...' for function '...' can be marked as a pointer to const (con.3).
-#pragma warning(disable: 26462) // The value pointed to by '...' is assigned only once, mark it as a pointer to const (con.4).
-#pragma warning(disable: 26494) // Variable '...' is uninitialized. Always initialize an object (type.5).
-#pragma warning(disable: 26489) // Don't dereference a pointer that may be invalid: '...'. '...' may have been invalidated at line ... (lifetime.1).
-#pragma warning(disable: 26488) // Do not dereference a potentially null pointer : ...'. '...' was null at line ... (lifetime.1).
-#pragma warning(disable: 26447) // The function is declared '...' but calls function '..' which may throw exceptions (f.6).
-#pragma warning(disable: 26485) // Expression '...': No array to pointer decay (bounds.3).
-#pragma warning(disable: 26457) // (void) should not be used to ignore return values, use '...' instead (es.48).
-#pragma warning(disable: 26487) // Don't return a pointer '...' that may be invalid (lifetime.4).
-#pragma warning(disable: 26451) // Arithmetic overflow : Using operator '...' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '...' to avoid overflow (io.2).
-#pragma warning(disable: 26455) //	 Default constructor may not throw.Declare it 'noexcept' (f.6).
-#pragma warning(disable: 26409) // Avoid calling new and delete explicitly, use std::make_unique<T> instead (r.11).
-#pragma warning(disable: 26429) // Symbol '...' is never tested for nullness, it can be marked as not_null(f.23).
-#pragma warning(disable: 26400) // Do not assign the result of an allocation or a function call with an owner<T> return value to a raw pointer, use owner<T> instead(i.11).
-#pragma warning(disable: 26467) // Converting from floating point to unsigned integral types results in non-portable code if the double/float has a negative value. Use gsl::narrow_cast or gsl::narrow instead to guard against undefined behavior and potential data loss (es.46).
-#pragma warning(disable: 26823) // Dereferencing a possibly null pointer '...' (lifetime.1).
-#include <import/xml/lite.h>
-
-#pragma warning(pop)
-
 #pragma warning(push)
 #pragma warning(disable: 26492) // Don't use const_cast to cast away const or volatile (type.3).
 #pragma warning(disable: 26812) // The enum type '...' is unscoped. Prefer '...' over '...' (Enum.3).
@@ -106,3 +74,4 @@
 #include <import/nrt.h>
 
 #pragma warning(pop)
+#pragma warning(pop)

six/modules/c++/scene/framework.h

@@ -28,10 +28,7 @@
 #pragma warning(disable: 26823) // Dereferencing a possibly null pointer '...' (lifetime.1).
 #pragma warning(disable: 26822) // Dereferencing a null pointer 'me' (lifetime.1).
 
-#pragma warning(push)
-#pragma warning(disable: 4464) // relative include path contains '..'
-#include "../../nitro_pch.h"
-#pragma warning(pop)
+#include "nitro_pch.h"
 
 #pragma warning(disable: 26400) // Do not assign the result of an allocation or a function call with an owner<T> return value to a raw pointer, use owner<T> instead(i.11).
 #pragma warning(disable: 26052) // Potentially unconstrained access using expression '...' ...