Compilations and CMake fixes to FreeImageRe

Author: TheNicker

CMakeLists.txt

@@ -31,7 +31,7 @@ option(IMCODEC_BUILD_CODEC_GIF "Build Codec GIF" TRUE)
 option(IMCODEC_BUILD_CODEC_ICON "Build Codec Icon" TRUE)
 option(IMCODEC_BUILD_CODEC_TIFF "Build Codec TIFF" TRUE)
 option(IMCODEC_BUILD_CODEC_WEBP "Build Codec WEBP" TRUE)
-option(IMCODEC_BUILD_CODEC_FREEIMAGE "Build Codec FREEIMAGE" FALSE)
+option(IMCODEC_BUILD_CODEC_FREEIMAGE "Build Codec FREEIMAGE" TRUE)
 
 option(IMCODEC_BUILD_EXAMPLES "Build Examples" TRUE)
 

Codecs/CodecFreeImage/CMakeLists.txt

@@ -14,7 +14,7 @@ add_library (${TargetName} STATIC ${sourceFiles})
 set(FreeImageReFolder ${CMAKE_CURRENT_LIST_DIR}/../../External/FreeImageRe)
 set(EXTERNALPROJECT_SOURCE_ROOT ${CMAKE_CURRENT_BINARY_DIR}/External/FreeImageRe/dependencies/source CACHE PATH "FreeImageRe dependency source directory")
 set(EXTERNALPROJECT_BINARY_ROOT ${CMAKE_CURRENT_BINARY_DIR}/External/FreeImageRe/dependencies/build CACHE PATH "FreeImageRe dependency build directory")
-foreach(FreeImageReBackend LIBJPEG LIBOPENJPEG LIBOPENEXR LIBPNG LIBTIFF LIBWEBP LIBRAW LIBHEIF LIBJPEGXL)
+foreach(FreeImageReBackend LIBJPEG LIBOPENJPEG LIBOPENEXR LIBPNG LIBTIFF LIBWEBP LIBHEIF LIBJPEGXL)
     set(FREEIMAGE_WITH_${FreeImageReBackend} OFF CACHE BOOL "Compile FreeImageRe with the ${FreeImageReBackend} backend" FORCE)
 endforeach()
 

Codecs/CodecFreeImage/Source/CodecFreeImage.h

@@ -23,9 +23,9 @@ namespace IMCodec
                     {
                         { LLUTILS_TEXT("Image formats collection")}
 
-                        ,{ LLUTILS_TEXT("BMP"),LLUTILS_TEXT("ICO"),LLUTILS_TEXT("JNG"),LLUTILS_TEXT("KOALA"),LLUTILS_TEXT("LBM"),LLUTILS_TEXT("IFF"),LLUTILS_TEXT("MNG"),LLUTILS_TEXT("PBM"),LLUTILS_TEXT("PBMRAW"),LLUTILS_TEXT("PCD"),LLUTILS_TEXT("PGM"),LLUTILS_TEXT("PGMRAW")
+                        ,{ LLUTILS_TEXT("BMP"),LLUTILS_TEXT("ICO"),LLUTILS_TEXT("JNG"),LLUTILS_TEXT("KOALA"),LLUTILS_TEXT("LBM"),LLUTILS_TEXT("IFF"),LLUTILS_TEXT("MNG"),LLUTILS_TEXT("PBM"),LLUTILS_TEXT("PBMRAW"),LLUTILS_TEXT("PCD"),LLUTILS_TEXT("PCX"),LLUTILS_TEXT("PGM"),LLUTILS_TEXT("PGMRAW")
                           ,LLUTILS_TEXT("PPM"),LLUTILS_TEXT("PPMRAW"),LLUTILS_TEXT("RAS"),LLUTILS_TEXT("TGA"),LLUTILS_TEXT("WBMP"),LLUTILS_TEXT("PSD"),LLUTILS_TEXT("CUT"),LLUTILS_TEXT("XBM"),LLUTILS_TEXT("XPM"),LLUTILS_TEXT("DDS"),LLUTILS_TEXT("GIF")
-                           ,LLUTILS_TEXT("HDR"),LLUTILS_TEXT("FAXG3"),LLUTILS_TEXT("SGI"),LLUTILS_TEXT("PFM"),LLUTILS_TEXT("PICT"),LLUTILS_TEXT("JXR"),LLUTILS_TEXT("CUR")
+                           ,LLUTILS_TEXT("HDR"),LLUTILS_TEXT("SGI"),LLUTILS_TEXT("PFM"),LLUTILS_TEXT("PICT"),LLUTILS_TEXT("RAW"),LLUTILS_TEXT("JXR")
                         }
                     }
                 }
@@ -43,7 +43,7 @@ namespace IMCodec
 
             using namespace IMCodec;
 
-            FIMEMORY* memStream = FreeImage_OpenMemory(reinterpret_cast<BYTE*>(const_cast<std::byte*>( buffer)),static_cast<DWORD>(size));
+            FIMEMORY* memStream = FreeImage_OpenMemory(reinterpret_cast<uint8_t*>(const_cast<std::byte*>( buffer)),static_cast<uint32_t>(size));
             FREE_IMAGE_FORMAT format =  FreeImage_GetFileTypeFromMemory(memStream, static_cast<int>(size));
             freeImageHandle = FreeImage_LoadFromMemory(format, memStream, 0);
             if (freeImageHandle && FreeImage_FlipVertical(freeImageHandle))

External/FreeImageRe

@@ -62,4 +62,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND
     if ( ${IMCODEC_BUILD_CODEC_TIFF})
         target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:tiff>.dll")
     endif()
+    if ( ${IMCODEC_BUILD_CODEC_FREEIMAGE})
+        target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:FreeImage>.dll")
+    endif()
 endif()