Added module to CoderInfo.

diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp
index 3a29b7e8adf3fafdbbbdf7f71a266892cc21747b..1154e794a8b089b0ca69df1d6dce037bb05fae0e 100644 (file)
--- a/Magick++/lib/CoderInfo.cpp
+++ b/Magick++/lib/CoderInfo.cpp
@@ -23,6 +23,7 @@ Magick::CoderInfo::CoderInfo(void)
     _isReadable(false),
     _isWritable(false),
     _mimeType(),
+    _module(),
     _name()
 {
 }
@@ -35,6 +36,7 @@ Magick::CoderInfo::CoderInfo(const Magick::CoderInfo &coder_)
     _isReadable(coder_._isReadable),
     _isWritable(coder_._isWritable),
     _mimeType(coder_._mimeType),
+    _module(coder_._module),
     _name(coder_._name)
 {
 }
@@ -47,6 +49,7 @@ Magick::CoderInfo::CoderInfo(const std::string &name_)
     _isReadable(false),
     _isWritable(false),
     _mimeType(),
+    _module(),
     _name()
 {
   const Magick::MagickInfo
@@ -62,7 +65,7 @@ Magick::CoderInfo::CoderInfo(const std::string &name_)
     {
       _decoderThreadSupport=(GetMagickDecoderThreadSupport(magickInfo) ==
         MagickTrue) ? true : false;
-      _description=string(magickInfo->description);
+      _description=std::string(magickInfo->description);
       _encoderThreadSupport=(GetMagickEncoderThreadSupport(magickInfo) ==
         MagickTrue) ? true : false;
       _isMultiFrame=(GetMagickAdjoin(magickInfo) == MagickTrue) ? true : false;
@@ -70,8 +73,10 @@ Magick::CoderInfo::CoderInfo(const std::string &name_)
         NULL) ? false : true);
       _isWritable=((magickInfo->encoder == (MagickCore::EncodeImageHandler *)
         NULL) ? false : true);
-      _mimeType=string(magickInfo->mime_type ? magickInfo->mime_type : "");
-      _name=string(magickInfo->name);
+      _mimeType=std::string(magickInfo->mime_type != (char *) NULL ?
+        magickInfo->mime_type : "");
+      _module=std::string(magickInfo->module);
+      _name=std::string(magickInfo->name);
     }
 }
 
@@ -91,6 +96,7 @@ Magick::CoderInfo& Magick::CoderInfo::operator=(const CoderInfo &coder_)
       _isReadable=coder_._isReadable;
       _isWritable=coder_._isWritable;
       _mimeType=coder_._mimeType;
+      _module=coder_._module;
       _name=coder_._name;
     }
   return(*this);
@@ -131,6 +137,11 @@ std::string Magick::CoderInfo::mimeType(void) const
   return(_mimeType);
 }
 
+std::string Magick::CoderInfo::module(void) const
+{
+  return(_module);
+}
+
 std::string Magick::CoderInfo::name(void) const
 {
   return(_name);

diff --git a/Magick++/lib/Magick++/CoderInfo.h b/Magick++/lib/Magick++/CoderInfo.h
index bee3e35284c7f8563a1205767e05f38f1345caca..f860020b65b808a3430cd515e225331574be0bb9 100644 (file)
--- a/Magick++/lib/Magick++/CoderInfo.h
+++ b/Magick++/lib/Magick++/CoderInfo.h
@@ -62,6 +62,9 @@ namespace Magick
     // Format mime type
     std::string mimeType(void) const;
 
+    // Name of the module
+    std::string module(void) const;
+
     // Format name
     std::string name(void) const;
 
@@ -69,14 +72,15 @@ namespace Magick
     bool unregister(void) const;
 
   private:
-    bool             _decoderThreadSupport;
-    std::string      _description;
-    bool             _encoderThreadSupport;
-    bool             _isMultiFrame;
-    bool             _isReadable;
-    bool             _isWritable;
-    std::string      _mimeType;
-    std::string      _name;
+    bool        _decoderThreadSupport;
+    std::string _description;
+    bool        _encoderThreadSupport;
+    bool        _isMultiFrame;
+    bool        _isReadable;
+    bool        _isWritable;
+    std::string _mimeType;
+    std::string _module;
+    std::string _name;
   };
 
 } // namespace Magick