From 41341ae1a035e65737186f72e88205aed0b540d1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 27 Apr 2018 13:26:42 -0700 Subject: [PATCH] Code review feedback --- DirectXTex/DirectXTexHDR.cpp | 14 +++++++------- Texassemble/Texassemble_Desktop_2015.vcxproj | 2 ++ Texassemble/Texassemble_Desktop_2017.vcxproj | 2 ++ Texconv/Texconv_Desktop_2015.vcxproj | 2 ++ Texconv/Texconv_Desktop_2017.vcxproj | 2 ++ Texdiag/texdiag_Desktop_2015.vcxproj | 2 ++ Texdiag/texdiag_Desktop_2017.vcxproj | 2 ++ 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/DirectXTex/DirectXTexHDR.cpp b/DirectXTex/DirectXTexHDR.cpp index 3103d8d..744a002 100644 --- a/DirectXTex/DirectXTexHDR.cpp +++ b/DirectXTex/DirectXTexHDR.cpp @@ -204,33 +204,33 @@ namespace } // Get orientation - char orient[256] = {}; + char orientation[256] = {}; - size_t len = FindEOL(info, std::min(sizeof(orient), size - 1)); + size_t len = FindEOL(info, std::min(sizeof(orientation), size - 1)); if (len == size_t(-1) || len <= 2) { return E_FAIL; } - strncpy_s(orient, info, len); + strncpy_s(orientation, info, len); - if (orient[0] != '-' && orient[1] != 'Y') + if (orientation[0] != '-' && orientation[1] != 'Y') { // We only support the -Y +X orientation (see top of file) return HRESULT_FROM_WIN32( - ((orient[0] == '+' || orient[0] == '-') && (orient[1] == 'X' || orient[1] == 'Y')) + ((orientation[0] == '+' || orientation[0] == '-') && (orientation[1] == 'X' || orientation[1] == 'Y')) ? ERROR_NOT_SUPPORTED : ERROR_INVALID_DATA ); } uint32_t height = 0; - if (sscanf_s(orient + 2, "%u", &height) != 1) + if (sscanf_s(orientation + 2, "%u", &height) != 1) { return E_FAIL; } - const char* ptr = orient + 2; + const char* ptr = orientation + 2; while (*ptr != 0 && *ptr != '-' && *ptr != '+') ++ptr; diff --git a/Texassemble/Texassemble_Desktop_2015.vcxproj b/Texassemble/Texassemble_Desktop_2015.vcxproj index 1b46a69..c7b6c6b 100644 --- a/Texassemble/Texassemble_Desktop_2015.vcxproj +++ b/Texassemble/Texassemble_Desktop_2015.vcxproj @@ -240,6 +240,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -280,6 +281,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) diff --git a/Texassemble/Texassemble_Desktop_2017.vcxproj b/Texassemble/Texassemble_Desktop_2017.vcxproj index 8fe58a3..b4dcb83 100644 --- a/Texassemble/Texassemble_Desktop_2017.vcxproj +++ b/Texassemble/Texassemble_Desktop_2017.vcxproj @@ -241,6 +241,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -281,6 +282,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) diff --git a/Texconv/Texconv_Desktop_2015.vcxproj b/Texconv/Texconv_Desktop_2015.vcxproj index 0cb305d..918b1d2 100644 --- a/Texconv/Texconv_Desktop_2015.vcxproj +++ b/Texconv/Texconv_Desktop_2015.vcxproj @@ -240,6 +240,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -280,6 +281,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) diff --git a/Texconv/Texconv_Desktop_2017.vcxproj b/Texconv/Texconv_Desktop_2017.vcxproj index 0a71d4b..b39173e 100644 --- a/Texconv/Texconv_Desktop_2017.vcxproj +++ b/Texconv/Texconv_Desktop_2017.vcxproj @@ -241,6 +241,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -281,6 +282,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) diff --git a/Texdiag/texdiag_Desktop_2015.vcxproj b/Texdiag/texdiag_Desktop_2015.vcxproj index 83e5f78..c7d46ff 100644 --- a/Texdiag/texdiag_Desktop_2015.vcxproj +++ b/Texdiag/texdiag_Desktop_2015.vcxproj @@ -240,6 +240,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -280,6 +281,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) diff --git a/Texdiag/texdiag_Desktop_2017.vcxproj b/Texdiag/texdiag_Desktop_2017.vcxproj index 9376da9..af0535f 100644 --- a/Texdiag/texdiag_Desktop_2017.vcxproj +++ b/Texdiag/texdiag_Desktop_2017.vcxproj @@ -241,6 +241,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions) @@ -281,6 +282,7 @@ ..\DirectXTex;%(AdditionalIncludeDirectories) /permissive- /Zc:twoPhase- %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + Guard %(AdditionalOptions)