Fixed: MSVC warnings

Author: TheNicker

Codecs/CodecBMP/Source/CodecBMP.h

@@ -78,11 +78,11 @@ namespace IMCodec
             return mPluginProperties;
         }
 
-        uint8_t GetValue(uint8_t bitWidth, const uint8_t* address, int position)
+        uint8_t GetValue(uint8_t bitWidth, const uint8_t* address, size_t position)
         {
             const int mask = (1 << bitWidth) - 1;
             const int PixelsInOneByte = CHAR_BIT / bitWidth;
-            const int byteOffset = position / PixelsInOneByte;
+            const size_t byteOffset = position / PixelsInOneByte;
             const int bitOffset = (CHAR_BIT - ((position % PixelsInOneByte) + 1) * bitWidth);
             const uint8_t currentByte = address[byteOffset];
             uint8_t value = ((currentByte & (mask << bitOffset))) >> bitOffset;
@@ -181,7 +181,7 @@ namespace IMCodec
                     }
 
                     const auto texelSize = IMCodec::GetTexelInfo(imageItem->descriptor.texelFormatDecompressed).texelSize;
-                    imageItem->descriptor.rowPitchInBytes = LLUtils::Utility::Align<size_t>(bmpInfo.biWidth * texelSize / CHAR_BIT, sizeof(uint32_t));
+                    imageItem->descriptor.rowPitchInBytes = LLUtils::Utility::Align<uint32_t>(bmpInfo.biWidth * texelSize / CHAR_BIT, sizeof(uint32_t));
                     const size_t destDataSize = imageItem->descriptor.rowPitchInBytes * imageItem->descriptor.height;
 
 
@@ -208,7 +208,7 @@ namespace IMCodec
 
                                 for (size_t x = 0; x < imageItem->descriptor.width; x++)
                                 {
-                                    uint8_t pixelIndex = GetValue(bmpInfo.biBitCount, baseSourceAddress + sourceLineOffset, x);
+                                    uint8_t pixelIndex = GetValue(static_cast<uint8_t>(bmpInfo.biBitCount), baseSourceAddress + sourceLineOffset, x);
                                     uint32_t color = 0xFF << 24 | colorTable[pixelIndex];
                                     uint32_t* currentpixel = reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(imageItem->data.data()) + destLineOffset) + x;
                                     *currentpixel = color;

Codecs/CodecGif/CMakeLists.txt

@@ -18,6 +18,8 @@ add_subdirectory(${giflibFolder} ./external/libgif)
 if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         target_compile_options(libgif PRIVATE -Wno-deprecated-declarations)
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        target_compile_options(libgif PRIVATE /wd4018 /wd4996 /wd4267 /wd4244)
     endif()
 endif()
 

Codecs/CodecIcon/Source/CodecIcon.h

@@ -75,12 +75,12 @@ namespace IMCodec
             return mPluginProperties;
         }
 
-        uint8_t GetValue(uint8_t bitWidth, const uint8_t* address, int position)
+        uint8_t GetValue(uint8_t bitWidth, const uint8_t* address, size_t position)
         {
-            const int mask = (1 << bitWidth) - 1;
-            const int PixelsInOneByte = CHAR_BIT / bitWidth;
-            const int byteOffset = position / PixelsInOneByte;
-            const int bitOffset = (CHAR_BIT - ((position % PixelsInOneByte) + 1) * bitWidth);
+            const size_t mask = (1 << bitWidth) - 1;
+            const size_t PixelsInOneByte = CHAR_BIT / bitWidth;
+            const size_t byteOffset = position / PixelsInOneByte;
+            const uint8_t bitOffset = static_cast<uint8_t>((CHAR_BIT - ((position % PixelsInOneByte) + 1) * bitWidth));
             const uint8_t currentByte = address[byteOffset];
             uint8_t value = ((currentByte & (mask << bitOffset))) >> bitOffset;
             return value;
@@ -165,7 +165,7 @@ namespace IMCodec
 
                                     for (size_t x = 0; x < currentDescriptor.width; x++)
                                     {
-                                        uint8_t pixelIndex = GetValue(bitmapInfo->biBitCount, baseSourceAddress + sourceLineOffset, x);
+                                        uint8_t pixelIndex = GetValue(static_cast<uint8_t>(bitmapInfo->biBitCount), baseSourceAddress + sourceLineOffset, x);
                                         uint8_t opacity = GetValue(MaskBitCount, baseSourceAddress + SourceLineMaskOffset, x);
                                         uint32_t color = ((opacity == 1 ? 0x00 : 0xFF) << 24) | colorTable[pixelIndex];
                                         uint32_t* currentpixel = reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(imageItem->data.data()) + destLineOffset) + x;

Codecs/CodecPNG/CMakeLists.txt

@@ -19,6 +19,8 @@ set(zlibFolder ../../External/zlib)
 if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         add_compile_options(-Wno-deprecated-non-prototype)
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        add_compile_options(/wd4244)
     endif()
 endif()
 

Codecs/CodecPNG/Source/CodecPng.h

@@ -196,7 +196,7 @@ namespace IMCodec
 
 
 
-                    for (auto frameIndex = 0; frameIndex < numFrames; frameIndex++)
+                    for (auto frameIndex = 0u; frameIndex < numFrames; frameIndex++)
                     {
                         auto& currentFrameBuffer = frameBuffers.at(frameIndex);
                         currentFrameBuffer.Allocate(canvasheight * targetRowPitchInBytes);
@@ -211,7 +211,7 @@ namespace IMCodec
 
                             LLUtils::Buffer readBuffer(sourceRowPitchInBytes);
                             png_bytep row_buf = (png_bytep)readBuffer.data();
-                            for (auto y = 0; y < frameheight; y++)
+                            for (auto y = 0u; y < frameheight; y++)
                             {
                                 const size_t rowBytes = framewidth * targetPixelSize;
                                 png_read_rows(png_ptr, (png_bytepp)&row_buf, nullptr, 1);

Codecs/CodecPSD/CMakeLists.txt

@@ -18,5 +18,7 @@ if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
         target_compile_options(libpsd PRIVATE -Wno-switch -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-pointer-sign -Wno-deprecated-declarations
         -Wno-pointer-to-int-cast -Wno-unused-variable -Wno-incompatible-function-pointer-types -Wno-int-to-pointer-cast -Wno-sometimes-uninitialized
         -Wno-unused-function -Wno-enum-conversion -Wno-empty-body)
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        target_compile_options(libpsd PRIVATE /wd4668 /wd4013 /wd4311 /wd4312 /wd4267 /wd4101 /wd4996)
     endif()
 endif()

Codecs/CodecTiff/CMakeLists.txt

@@ -52,6 +52,8 @@ if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
             -Wno-reserved-identifier
             -Wno-missing-variable-declarations
             )
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        target_compile_options(tiff PRIVATE /wd4996)
     endif()
     target_compile_definitions(tiff PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif()