Changed: codec parameters interface

Author: Lior Lahav

Codecs/CodecJPG/Source/CodecJpeg.h

@@ -63,16 +63,13 @@ namespace IMCodec
         {
             static thread_local tjhandle ftjHandle = tjInitDecompress();
             ImageResult result = ImageResult::UnknownError;
-/*
             int canvasWidth = 0;
-            int canvasHeight = 0;
-
-            if (params.contains(L"canvasWidth"))
-                canvasWidth = std::get<int>(params.at(L"canvasWidth"));
+            if (const int* width = params.GetCustomAs<int>(LLUTILS_TEXT("canvasWidth")))
+                canvasWidth = *width;
 
-            if (params.contains(L"canvasHeight"))
-                canvasHeight = std::get<int>(params.at(L"canvasHeight"));
-*/
+            int canvasHeight = 0;
+            if (const int* height = params.GetCustomAs<int>(LLUTILS_TEXT("canvasHeight")))
+                canvasHeight = *height;
 
 
             int width = 0;

ImageCodec/CMakeLists.txt

@@ -9,40 +9,44 @@ file(GLOB_RECURSE sourceFiles
 set(TargetName ImageCodec)
 add_library (${TargetName} ${sourceFiles} )
 
-target_include_directories(${TargetName} PRIVATE ./Include)
+target_include_directories(${TargetName} PUBLIC ./Include)
+target_include_directories(${TargetName} PUBLIC /ImageUtil/Include)
 target_include_directories(${TargetName} PRIVATE ../External/TinyExif)
 
 if ( ${IMCODEC_BUILD_CODEC_BMP})
-    target_link_libraries(${TargetName} CodecBMP)
+    target_link_libraries(${TargetName} PRIVATE CodecBMP)
 endif()
 
 if ( ${IMCODEC_BUILD_CODEC_DDS})
-    target_link_libraries(${TargetName} CodecDDS)
+    target_link_libraries(${TargetName} PRIVATE CodecDDS)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_ICON})
-    target_link_libraries(${TargetName} CodecIcon)
+    target_link_libraries(${TargetName} PRIVATE CodecIcon)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_PSD})
-    target_link_libraries(${TargetName} CodecPSD)
+    target_link_libraries(${TargetName} PRIVATE CodecPSD)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_JPG})
-    target_link_libraries(${TargetName} CodecJPG)
+    target_link_libraries(${TargetName} PRIVATE CodecJPG)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_PNG})
-    target_link_libraries(${TargetName} CodecPNG)
+    target_link_libraries(${TargetName} PRIVATE CodecPNG)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_GIF})
-    target_link_libraries(${TargetName} CodecGif)
+    target_link_libraries(${TargetName} PRIVATE CodecGif)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_TIFF})
-    target_link_libraries(${TargetName} CodecTiff)
+    target_link_libraries(${TargetName} PRIVATE CodecTiff)
 endif()
 if ( ${IMCODEC_BUILD_CODEC_WEBP})
-    target_link_libraries(${TargetName} CodecWebP)
+    target_link_libraries(${TargetName} PRIVATE CodecWebP)
 endif()
 
 if ( ${IMCODEC_BUILD_CODEC_FREEIMAGE})
-    target_link_libraries(${TargetName} CodecFreeImage)
+    target_link_libraries(${TargetName} PRIVATE CodecFreeImage)
 endif()
 
-target_link_libraries(${TargetName} TinyEXIFstatic)
+target_link_libraries(${TargetName} PRIVATE TinyEXIFstatic)
+target_link_libraries(${TargetName} PUBLIC delayimp)
+
+

ImageCodec/Include/IImagePlugin.h

@@ -4,8 +4,7 @@
 #include <LLUtils/Exception.h>
 #include "ImageCommon.h"
 #include "ImageItem.h"
-#include <variant>
-#include <map>
+#include "ImagePluginParameters.h"
 
 namespace IMCodec
 {
@@ -54,9 +53,7 @@ namespace IMCodec
     };
 
 
-    using Parameter = std::variant<int, double, string_type>;
-    using Parameters = std::map<string_type, Parameter>;
-
+   
     struct ParameterDescriptor
     {
         string_type name;

ImageCodec/Include/ImagePluginParameters.h

@@ -0,0 +1,80 @@
+#pragma once
+
+#include "ImageCommon.h"
+
+#include <any>
+#include <map>
+#include <utility>
+#include <variant>
+
+namespace IMCodec
+{
+    using SharedParameterValue = std::variant<int, double, string_type>;
+
+    enum class ParametrType
+    {
+        None,
+        DesiredSize
+    };
+
+    class Parameters
+    {
+    public:
+        using SharedParametersMap = std::map<ParametrType, SharedParameterValue>;
+        using CustomParametersMap = std::map<string_type, std::any>;
+
+        void SetShared(ParametrType type, SharedParameterValue value)
+        {
+            sharedParameters_.insert_or_assign(type, std::move(value));
+        }
+
+        const SharedParameterValue* GetShared(ParametrType type) const
+        {
+            auto it = sharedParameters_.find(type);
+            return it != sharedParameters_.end() ? &it->second : nullptr;
+        }
+
+        bool HasShared(ParametrType type) const
+        {
+            return sharedParameters_.find(type) != sharedParameters_.end();
+        }
+
+        template <class T>
+        const T* GetSharedAs(ParametrType type) const
+        {
+            auto it = sharedParameters_.find(type);
+            if (it != sharedParameters_.end())
+                return std::get_if<T>(&it->second);
+            return nullptr;
+        }
+
+        void SetCustom(string_type key, std::any value)
+        {
+            customParameters_.insert_or_assign(std::move(key), std::move(value));
+        }
+
+        const std::any* GetCustom(const string_type& key) const
+        {
+            auto it = customParameters_.find(key);
+            return it != customParameters_.end() ? &it->second : nullptr;
+        }
+
+        bool HasCustom(const string_type& key) const
+        {
+            return customParameters_.find(key) != customParameters_.end();
+        }
+
+        template <class T>
+        const T* GetCustomAs(const string_type& key) const
+        {
+            auto it = customParameters_.find(key);
+            if (it != customParameters_.end())
+                return std::any_cast<T>(&it->second);
+            return nullptr;
+        }
+
+    private:
+        SharedParametersMap sharedParameters_;
+        CustomParametersMap customParameters_;
+    };
+}