From abe3e208b0213d71e57f295b6e16c2fc93d21a1d Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 1 Dec 2020 15:33:48 -0800 Subject: [PATCH] Fixed -Wsign-conversion --- CMakeLists.txt | 2 +- UVAtlasTool/UVAtlas.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70505fd..030afdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ source_group(isochart REGULAR_EXPRESSION UVAtlas/isochart/*.*) source_group(isochart REGULAR_EXPRESSION UVAtlas/isochart/*.*) target_include_directories(${PROJECT_NAME} PUBLIC UVAtlas/inc) -target_include_directories(${PROJECT_NAME} PRIVATE UVAtlas UVAtlas/UVAtlas/geodesics UVAtlas/isochart) +target_include_directories(${PROJECT_NAME} PRIVATE UVAtlas UVAtlas/geodesics UVAtlas/isochart) if(MSVC) # Use higher Warning Level diff --git a/UVAtlasTool/UVAtlas.cpp b/UVAtlasTool/UVAtlas.cpp index d9dc21e..28c0247 100644 --- a/UVAtlasTool/UVAtlas.cpp +++ b/UVAtlasTool/UVAtlas.cpp @@ -888,8 +888,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[]) else { hr = LoadFromOBJ(pConv->szSrc, inMesh, inMaterial, - (dwOptions & (1 << OPT_CLOCKWISE)) ? false : true, - (dwOptions & (1 << OPT_NODDS)) ? false : true); + (dwOptions & (DWORD64(1) << OPT_CLOCKWISE)) ? false : true, + (dwOptions & (DWORD64(1) << OPT_NODDS)) ? false : true); } if (FAILED(hr)) {