Fixed: Linux compilation

TheNicker · TheNicker · commit b9265372f48b · 2023-10-18T21:39:14.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,10 @@ option(IMCODEC_BUILD_CODEC_FREEIMAGE "Build Codec FREEIMAGE" FALSE)
 
 option(IMCODEC_BUILD_EXAMPLES "Build Examples" TRUE)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+endif()
+
 
 if ( ${IMCODEC_BUILD_CODEC_PSD})
 	add_definitions(-DIMCODEC_BUILD_CODEC_PSD=1)
@@ -65,10 +69,10 @@ option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" OFF)
 add_subdirectory(./External/tinyxml2)
 
 option(TINY_EXIF_BUILD_DEMO "build demo binary" OFF)
-add_subdirectory(./External/tinyEXIF)
+add_subdirectory(./External/TinyEXIF)
 
 add_subdirectory(ImageCodec)
 
-if (IMCODEC_BUILD_EXAMPLES)
+if (IMCODEC_BUILD_EXAMPLES AND IMCODEC_BUILD_CODEC_JPG AND IMCODEC_BUILD_CODEC_PNG)
   add_subdirectory(Example)
 endif()
diff --git a/Codecs/CMakeLists.txt b/Codecs/CMakeLists.txt
@@ -19,10 +19,10 @@ if ( ${IMCODEC_BUILD_CODEC_GIF})
     add_subdirectory(CodecGif)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_TIFF})
-    add_subdirectory(CodecTIFF)
+    add_subdirectory(CodecTiff)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_WEBP})
-    add_subdirectory(CodecWEBP)
+    add_subdirectory(CodecWebP)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_FREEIMAGE})
     add_subdirectory(CodecFreeImage)
diff --git a/Codecs/CodecBMP/Source/CodecBMP.h b/Codecs/CodecBMP/Source/CodecBMP.h
@@ -107,12 +107,12 @@ namespace IMCodec
                 { 0x20fda67, 0x8877, 0x4ead, { 0x8e, 0x8e, 0xd1, 0x54, 0x64, 0xb7, 0xc6, 0xc7 } }
 
                 ,CodecCapabilities::Decode
-                 ,L"BMP image codec"
+                 ,LLUTILS_TEXT("BMP image codec")
                 ,
                 {
                     {
-                        { L"Bitmap image file"}
-                        ,{ L"bmp"}
+                        { LLUTILS_TEXT("Bitmap image file")}
+                        ,{ LLUTILS_TEXT("bmp")}
                     }
                 }
             }
diff --git a/Codecs/CodecDDS/Source/CodecDDS.h b/Codecs/CodecDDS/Source/CodecDDS.h
@@ -20,12 +20,12 @@ namespace IMCodec
                 // {252347B1-91E7-4C5C-8F06-726B0A52DE6D}
                 { 0x252347b1, 0x91e7, 0x4c5c, { 0x8f, 0x6, 0x72, 0x6b, 0xa, 0x52, 0xde, 0x6d } }
                 ,CodecCapabilities::Decode
-                ,L"NV_DDS image codec"
+                ,LLUTILS_TEXT("NV_DDS image codec")
                 ,
                 {
                     {
-                        { L"DDS - DirectDraw Surface Image"}
-                            ,{ L"dds"}
+                        { LLUTILS_TEXT("DDS - DirectDraw Surface Image")}
+                            ,{ LLUTILS_TEXT("dds")}
                     }
                 }
             }
diff --git a/Codecs/CodecGif/Source/CodecGif.h b/Codecs/CodecGif/Source/CodecGif.h
@@ -38,12 +38,12 @@ namespace IMCodec
             // {1D076943-F907-426A-8DC6-838B8CCE320C}
              { 0x1d076943, 0xf907, 0x426a, { 0x8d, 0xc6, 0x83, 0x8b, 0x8c, 0xce, 0x32, 0xc } }
             ,CodecCapabilities::Decode
-            , L"Gif Codec"
+            , LLUTILS_TEXT("Gif Codec")
                 ,
                 {
                     {
-                        { L"Graphics Interchange Format"}
-                       ,{ L"gif"}
+                        { LLUTILS_TEXT("Grapics Interchange Format")}
+                       ,{ LLUTILS_TEXT("gif")}
                     }
                 }
         };
diff --git a/Codecs/CodecIcon/Source/CodecIcon.h b/Codecs/CodecIcon/Source/CodecIcon.h
@@ -33,6 +33,22 @@ namespace IMCodec
         IcoDirEntry entry[1];
     };
 
+    struct BitmapInfoHeader
+    {
+        uint32_t      biSize;
+        int32_t       biWidth;
+        int32_t       biHeight;
+        uint16_t      biPlanes;
+        uint16_t      biBitCount;
+        uint32_t      biCompression;
+        uint32_t      biSizeImage;
+        int32_t       biXPelsPerMeter;
+        int32_t       biYPelsPerMeter;
+        uint32_t      biClrUsed;
+        uint32_t      biClrImportant;
+    };
+
+
 #pragma pack(pop)
 
     class CodecIcon : public IImagePlugin
@@ -50,17 +66,17 @@ namespace IMCodec
                 { 0x1599fc40, 0x58df, 0x4950, { 0xa4, 0x9b, 0x28, 0x80, 0xe7, 0x28, 0xce, 0x0 } }
 
                  ,CodecCapabilities::Decode
-                , L"Icon/Cursor Codec"
+                , LLUTILS_TEXT("Icon/Cursor Codec")
                 ,
                 {
                     {
-                        { L"Windows Icon File"}
-                            ,{ L"ico",L"icon"}
+                        { LLUTILS_TEXT("Windows Icon File")}
+                            ,{ LLUTILS_TEXT("ico"),LLUTILS_TEXT("icon")}
                     }
                     ,
                     {
-                        { L"Windows Cursor File"}
-                            ,{ L"cur"}
+                        {LLUTILS_TEXT("Windows Cursor File")}
+                            ,{ LLUTILS_TEXT("cur")}
                     }
                 }
                 
@@ -121,8 +137,7 @@ namespace IMCodec
                  
                         auto& currentDescriptor = imageItem->descriptor;
                         const IcoDirEntry* currentEntry = (&icoFile->entry)[i];
-                        
-                        const BITMAPINFOHEADER* bitmapInfo = reinterpret_cast<const BITMAPINFOHEADER*>(baseAddress + currentEntry->offsetData);
+                        const BitmapInfoHeader* bitmapInfo = reinterpret_cast<const BitmapInfoHeader*>(baseAddress + currentEntry->offsetData);
                         if (bitmapInfo->biSize == 40)
                         {
                             if (bitmapInfo->biCompression != 0)
@@ -234,7 +249,7 @@ namespace IMCodec
                             sIsLoading = true;
                             static thread_local ImageLoader helper;
                             ImageResult pngRes = helper.Decode(reinterpret_cast<const std::byte*>(baseAddress + currentEntry->offsetData), currentEntry->imageDataSize
-                                , ImageLoadFlags::None, {}, L"png", PluginTraverseMode::AnyPlugin, pngImage);
+                                , ImageLoadFlags::None, {}, LLUTILS_TEXT("png"), PluginTraverseMode::AnyPlugin, pngImage);
 
                             if (pngRes == ImageResult::Success)
                             {
diff --git a/Codecs/CodecJPG/CMakeLists.txt b/Codecs/CodecJPG/CMakeLists.txt
@@ -13,7 +13,9 @@ add_library (${TargetName} ${sourceFiles} )
 set(libjpeg-turboFolder ../../External/libjpeg-turbo)
 #Enable ASM provided by NASM
 
-set(CMAKE_ASM_NASM_COMPILER ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(CMAKE_ASM_NASM_COMPILER ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
+endif()
 #set(ENV{ASM_NASM} ${CMAKE_CURRENT_SOURCE_DIR}/../../External/bintools/nasm-2.15.05/nasm.exe)
 
 #set(CMAKE_ASM_COMPILE_OBJECT "-I<CMAKE_CURRENT_SOURCE_DIR>/../../External/libjpeg-turbo/simd/nasm 
@@ -30,4 +32,7 @@ add_subdirectory(${libjpeg-turboFolder} ./external/libjpeg-turbo)
 target_include_directories(${TargetName} PRIVATE ${libjpeg-turboFolder})
 
 target_link_libraries(${TargetName} turbojpeg)
-target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:turbojpeg>.dll")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:turbojpeg>.dll")
+else()
+endif()
diff --git a/Codecs/CodecJPG/Source/CodecJpeg.h b/Codecs/CodecJPG/Source/CodecJpeg.h
@@ -15,12 +15,12 @@ namespace IMCodec
                 // {7798CB6A-5546-4EAD-BA95-A114C8520D0D}
                 { 0x7798cb6a, 0x5546, 0x4ead, { 0xba, 0x95, 0xa1, 0x14, 0xc8, 0x52, 0xd, 0xd } }
                 , CodecCapabilities::Encode | CodecCapabilities::Decode 
-                ,L"TurboJpeg" 
+                ,LLUTILS_TEXT("TurboJpeg") 
                 ,
                 {
                     {
-                        { L"Joint Photographic Experts Group"}
-                            ,{ L"jpg",L"jpeg"}
+                        { LLUTILS_TEXT("Joint Photographic Experts Group")}
+                            ,{ LLUTILS_TEXT("jpg"),LLUTILS_TEXT("jpeg")}
                     }
                 }
             };
@@ -158,8 +158,9 @@ namespace IMCodec
         }
 
         ImageResult GetEncoderParameters(ListParameterDescriptors& out_encodeParameters) override 
-        { 
-            out_encodeParameters = { {L"quality",L"double",L"Jpeg compression quality",L"Higher value means better quality",L"80",L"0",L"100"} };
+        {
+            out_encodeParameters = { {LLUTILS_TEXT("quality"),LLUTILS_TEXT("double"),LLUTILS_TEXT("Jpeg compression quality")
+            ,LLUTILS_TEXT("Higher value means better quality"),LLUTILS_TEXT("80"),LLUTILS_TEXT("0"),LLUTILS_TEXT("100")} };
             return ImageResult::Success;
         }
     };
diff --git a/Codecs/CodecPNG/CMakeLists.txt b/Codecs/CodecPNG/CMakeLists.txt
@@ -14,6 +14,7 @@ add_library (${TargetName} ${sourceFiles} )
 option(ZLIB_BUILD_BINARIES "Build zlib test sample and example" OFF)
 set(LibPNGFolder ../../External/libpng)
 set(zlibFolder ../../External/zlib)
+cmake_path(ABSOLUTE_PATH zlibFolder NORMALIZE OUTPUT_VARIABLE zlibFolder)
 
 #Remove -Wdeprecated-non-prototype for zblib
 if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
diff --git a/Codecs/CodecPNG/Source/CodecPng.h b/Codecs/CodecPNG/Source/CodecPng.h
@@ -53,12 +53,12 @@ namespace IMCodec
                 { 0x22a82f61, 0x4c92, 0x432e, { 0x93, 0xeb, 0x63, 0x5e, 0x24, 0x54, 0x53, 0x6 } }
 
                 , CodecCapabilities::Decode | CodecCapabilities::Encode
-                , L"PNG Codec"
+                , LLUTILS_TEXT("PNG Codec")
                 ,
                 {
                     {
-                        { L"Portable Network Graphics"}
-                       ,{ L"png"}
+                        { LLUTILS_TEXT("Portable Network Graphics")}
+                       ,{ LLUTILS_TEXT("png")}
                     }
                 }
             };
diff --git a/Codecs/CodecPSD/CMakeLists.txt b/Codecs/CodecPSD/CMakeLists.txt
@@ -14,10 +14,13 @@ include_directories(${LibPSDFolder}/include)
 target_link_libraries(${TargetName} libpsd)
 
 if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         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)
+        if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+            target_compile_options(libpsd PRIVATE -Wno-builtin-declaration-mismatch -Wno-multichar -Wno-incompatible-pointer-types)
+        endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
         target_compile_options(libpsd PRIVATE /wd4668 /wd4013 /wd4311 /wd4312 /wd4267 /wd4101 /wd4996)
     endif()
diff --git a/Codecs/CodecPSD/Source/CodecPSD.h b/Codecs/CodecPSD/Source/CodecPSD.h
@@ -15,12 +15,12 @@ namespace IMCodec
                 // {D5DD791B-D177-4584-A076-226CC79D4CF9}
                  { 0xd5dd791b, 0xd177, 0x4584, { 0xa0, 0x76, 0x22, 0x6c, 0xc7, 0x9d, 0x4c, 0xf9 } }
                 ,CodecCapabilities::Decode
-                ,L"PSDLib Codec"
+                ,LLUTILS_TEXT("PSDLib Codec")
                 ,
                 {
                     {
-                        { L"Photosop document"}
-                            ,{ L"psd"}
+                        { LLUTILS_TEXT("Photosop document")}
+                            ,{ LLUTILS_TEXT("psd")}
                     }
                 }
             };
diff --git a/Codecs/CodecTiff/CMakeLists.txt b/Codecs/CodecTiff/CMakeLists.txt
@@ -54,22 +54,21 @@ if (IMCODEC_DISABLE_WARNINGS_EXTERNAL_LIBS)
             -Wno-missing-variable-declarations
             -Wno-unsafe-buffer-usage
             )
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        target_compile_options(tiff PRIVATE -Wno-array-parameter -Wno-misleading-indentation)
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
         target_compile_options(tiff PRIVATE /wd4996)
     endif()
     target_compile_definitions(tiff PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif()
 
 
-
-
 target_include_directories(${TargetName} PRIVATE ${LibTiffFolder}/libtiff)
-target_include_directories(${TargetName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}./external/libtiff/libtiff)
-
+target_include_directories(${TargetName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/libtiff/libtiff)
 
 
+target_link_libraries(${TargetName} tiff)
 if(MSVC)
    #set_property(TARGET tiff PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS true)
-   target_link_libraries(${TargetName} tiff)
    target_link_options(${TargetName} PUBLIC "/DELAYLOAD:$<TARGET_FILE_BASE_NAME:tiff>.dll")
 endif()
diff --git a/Codecs/CodecTiff/Source/CodecTiff.h b/Codecs/CodecTiff/Source/CodecTiff.h
@@ -22,12 +22,12 @@ namespace IMCodec
                 // {3AF4C3A1-FA72-4394-8B7C-68412A3433E3}
                 { 0x3af4c3a1, 0xfa72, 0x4394, { 0x8b, 0x7c, 0x68, 0x41, 0x2a, 0x34, 0x33, 0xe3 } }
                 , CodecCapabilities::Decode
-                , L"LibTiff image codec"
+                , LLUTILS_TEXT("LibTiff image codec")
                 ,
                 {
                     {
-                        { L"Tag Image File Format"}
-                        ,{ L"tif",L"tiff"}
+                        { LLUTILS_TEXT("Tag Image File Format")}
+                        ,{ LLUTILS_TEXT("tif"),LLUTILS_TEXT("tiff")}
                     }
                 }
 
diff --git a/Codecs/CodecWebP/Source/CodecWebP.h b/Codecs/CodecWebP/Source/CodecWebP.h
@@ -20,12 +20,12 @@ namespace IMCodec
                 // {3DEF6662-48D7-4D61-9D96-C15FEDA9E4F4}
                 { 0x3def6662, 0x48d7, 0x4d61, { 0x9d, 0x96, 0xc1, 0x5f, 0xed, 0xa9, 0xe4, 0xf4 } }
                 , CodecCapabilities::Decode
-                 , L"WebP Codec"
+                 , LLUTILS_TEXT("WebP Codec")
                 ,
                 {
                     {
-                        { L"WebP image file"}
-                            ,{ L"webp"}
+                        { LLUTILS_TEXT("WebP image file")}
+                            ,{LLUTILS_TEXT("webp")}
                     }
                 }
 
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -14,7 +14,11 @@ add_executable(${TargetName} ${sourceFiles})
 
 
 target_include_directories(${TargetName} PRIVATE ./Imageloader/Include)
-target_link_libraries(${TargetName} PRIVATE ImageCodec delayimp)
+target_link_libraries(${TargetName} PRIVATE ImageCodec)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    target_link_libraries(${TargetName} PRIVATE delayimp)
+endif()
 
 
 #Copy oiv library resources to the output dir 
diff --git a/Example/cat.jpg b/Example/cat.jpg
diff --git a/Example/example.cpp b/Example/example.cpp
@@ -9,14 +9,14 @@ int main()
 	ImageSharedPtr out_image;
 	IMCodec::ImageLoader loader;
 	int resultCode{};
-	if (loader.Decode(L"cat.jpg",ImageLoadFlags::None, {},PluginTraverseMode::AnyPlugin,out_image)
+	if (loader.Decode(LLUTILS_TEXT("cat.jpg"),ImageLoadFlags::None, {},PluginTraverseMode::AnyPlugin,out_image)
 		== ImageResult::Success)
 	{
 		std::cout << "\ncat.jpg has been decoded in: " << std::setprecision(2) << std::fixed << out_image->GetProcessData().processTime << " ms";
 
 		LLUtils::Buffer encodedBuffer;
 		LLUtils::StopWatch encodeTime(true);
-		if (loader.Encode(out_image, L"./output/cat.png") == ImageResult::Success)
+		if (loader.Encode(out_image, LLUTILS_TEXT("./output/cat.png")) == ImageResult::Success)
 		{
 			
 			std::cout << "\ncat.png has been encoded in: " << std::setprecision(2) << std::fixed<< encodeTime.GetElapsedTimeReal(LLUtils::StopWatch::Milliseconds) << " ms";
diff --git a/External/LLUtils b/External/LLUtils
@@ -1 +1 @@
-Subproject commit 9c5e661cf33aa5f1d39812c77ed617702e093d2e
+Subproject commit b85ef93548769a3f9d344c69e56122ae4cd78eb5
diff --git a/External/TinyEXIF b/External/TinyEXIF
@@ -1 +1 @@
-Subproject commit 6e4568c8416c1308c7becce0cdec733a98569538
+Subproject commit 5d451c083444769e792fe81ea1a7c4ab4ccf86ca
diff --git a/External/libgif b/External/libgif
@@ -1 +1 @@
-Subproject commit aac6c5e968faa211c0656c94978bca11b8d2524d
+Subproject commit 2e210de51989efc3f286cb5af78ca0c7e7e31bb4
diff --git a/External/libjpeg-turbo b/External/libjpeg-turbo
@@ -1 +1 @@
-Subproject commit a9adaa03b92552293e20031b184c4b110988870e
+Subproject commit b21c7be108a5936fbdc8aa117aa05f5a8ea3fbc8
diff --git a/External/libpng b/External/libpng
@@ -1 +1 @@
-Subproject commit ae2f998a0a8606b74ff3ccc3570e0a6749c04c6d
+Subproject commit 750f77cce0784fc7bfd6ab6d93e2a5b9be8a2d9b
diff --git a/External/libpsd b/External/libpsd
@@ -1 +1 @@
-Subproject commit fff1101ba42e2224cb7ac4947aa9441984ceb9d6
+Subproject commit 2f78b031130e91477cd0d79105bc890be0382dbd
diff --git a/ImageCodec/Include/IImagePlugin.h b/ImageCodec/Include/IImagePlugin.h
diff --git a/ImageCodec/Include/ImageCommon.h b/ImageCodec/Include/ImageCommon.h
diff --git a/ImageCodec/Include/ImageLoader.h b/ImageCodec/Include/ImageLoader.h
diff --git a/ImageCodec/Include/TexelFormat.h b/ImageCodec/Include/TexelFormat.h

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,12 @@ namespace IMCodec`
`107`	`107`	`{ 0x20fda67, 0x8877, 0x4ead, { 0x8e, 0x8e, 0xd1, 0x54, 0x64, 0xb7, 0xc6, 0xc7 } }`
`108`	`108`
`109`	`109`	`,CodecCapabilities::Decode`
`110`		`- ,L"BMP image codec"`
	`110`	`+ ,LLUTILS_TEXT("BMP image codec")`
`111`	`111`	`,`
`112`	`112`	`{`
`113`	`113`	`{`
`114`		`- { L"Bitmap image file"}`
`115`		`- ,{ L"bmp"}`
	`114`	`+ { LLUTILS_TEXT("Bitmap image file")}`
	`115`	`+ ,{ LLUTILS_TEXT("bmp")}`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ namespace IMCodec`
`20`	`20`	`// {252347B1-91E7-4C5C-8F06-726B0A52DE6D}`
`21`	`21`	`{ 0x252347b1, 0x91e7, 0x4c5c, { 0x8f, 0x6, 0x72, 0x6b, 0xa, 0x52, 0xde, 0x6d } }`
`22`	`22`	`,CodecCapabilities::Decode`
`23`		`- ,L"NV_DDS image codec"`
	`23`	`+ ,LLUTILS_TEXT("NV_DDS image codec")`
`24`	`24`	`,`
`25`	`25`	`{`
`26`	`26`	`{`
`27`		`- { L"DDS - DirectDraw Surface Image"}`
`28`		`- ,{ L"dds"}`
	`27`	`+ { LLUTILS_TEXT("DDS - DirectDraw Surface Image")}`
	`28`	`+ ,{ LLUTILS_TEXT("dds")}`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ namespace IMCodec`
`38`	`38`	`// {1D076943-F907-426A-8DC6-838B8CCE320C}`
`39`	`39`	`{ 0x1d076943, 0xf907, 0x426a, { 0x8d, 0xc6, 0x83, 0x8b, 0x8c, 0xce, 0x32, 0xc } }`
`40`	`40`	`,CodecCapabilities::Decode`
`41`		`- , L"Gif Codec"`
	`41`	`+ , LLUTILS_TEXT("Gif Codec")`
`42`	`42`	`,`
`43`	`43`	`{`
`44`	`44`	`{`
`45`		`- { L"Graphics Interchange Format"}`
`46`		`- ,{ L"gif"}`
	`45`	`+ { LLUTILS_TEXT("Grapics Interchange Format")}`
	`46`	`+ ,{ LLUTILS_TEXT("gif")}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`};`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ namespace IMCodec`
`15`	`15`	`// {7798CB6A-5546-4EAD-BA95-A114C8520D0D}`
`16`	`16`	`{ 0x7798cb6a, 0x5546, 0x4ead, { 0xba, 0x95, 0xa1, 0x14, 0xc8, 0x52, 0xd, 0xd } }`
`17`	`17`	`, CodecCapabilities::Encode \| CodecCapabilities::Decode`
`18`		`- ,L"TurboJpeg"`
	`18`	`+ ,LLUTILS_TEXT("TurboJpeg")`
`19`	`19`	`,`
`20`	`20`	`{`
`21`	`21`	`{`
`22`		`- { L"Joint Photographic Experts Group"}`
`23`		`- ,{ L"jpg",L"jpeg"}`
	`22`	`+ { LLUTILS_TEXT("Joint Photographic Experts Group")}`
	`23`	`+ ,{ LLUTILS_TEXT("jpg"),LLUTILS_TEXT("jpeg")}`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`};`
`@@ -158,8 +158,9 @@ namespace IMCodec`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`ImageResult GetEncoderParameters(ListParameterDescriptors& out_encodeParameters) override`
`161`		`- {`
`162`		`- out_encodeParameters = { {L"quality",L"double",L"Jpeg compression quality",L"Higher value means better quality",L"80",L"0",L"100"} };`
	`161`	`+ {`
	`162`	`+ out_encodeParameters = { {LLUTILS_TEXT("quality"),LLUTILS_TEXT("double"),LLUTILS_TEXT("Jpeg compression quality")`
	`163`	`+ ,LLUTILS_TEXT("Higher value means better quality"),LLUTILS_TEXT("80"),LLUTILS_TEXT("0"),LLUTILS_TEXT("100")} };`
`163`	`164`	`return ImageResult::Success;`
`164`	`165`	`}`
`165`	`166`	`};`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,12 @@ namespace IMCodec`
`53`	`53`	`{ 0x22a82f61, 0x4c92, 0x432e, { 0x93, 0xeb, 0x63, 0x5e, 0x24, 0x54, 0x53, 0x6 } }`
`54`	`54`
`55`	`55`	`, CodecCapabilities::Decode \| CodecCapabilities::Encode`
`56`		`- , L"PNG Codec"`
	`56`	`+ , LLUTILS_TEXT("PNG Codec")`
`57`	`57`	`,`
`58`	`58`	`{`
`59`	`59`	`{`
`60`		`- { L"Portable Network Graphics"}`
`61`		`- ,{ L"png"}`
	`60`	`+ { LLUTILS_TEXT("Portable Network Graphics")}`
	`61`	`+ ,{ LLUTILS_TEXT("png")}`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`};`