(no commit message)

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 6ca86c9af334a916681cfcd322da3864fb13afd6..8b70f5d3b43ebb7bcea9e6a7b3ef9f1212858822 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -728,6 +728,7 @@ namespace Magick
   using MagickCore::GetImageClipMask;
   using MagickCore::GetImageDepth;
   using MagickCore::GetImageInfo;
+  using MagickCore::GetImageInfoFile;
   using MagickCore::GetImageOption;
   using MagickCore::GetAuthenticPixels;
   using MagickCore::GetImageProfile;
@@ -852,6 +853,7 @@ namespace Magick
   using MagickCore::SetImageDepth;
   using MagickCore::SetImageExtent;
   using MagickCore::SetImageInfo;
+  using MagickCore::SetImageInfoFile;
   using MagickCore::SetImageOpacity;
   using MagickCore::SetImageOption;
   using MagickCore::SetImageProfile;

diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h
index 1e308dbec4e316da80386fce9125e98fce428df4..47136f4676ee9f5a5c603ea324042ef15a2067ac 100644 (file)
--- a/Magick++/lib/Magick++/Options.h
+++ b/Magick++/lib/Magick++/Options.h
@@ -87,6 +87,10 @@ namespace Magick
     void            endian ( EndianType endian_ );
     EndianType      endian ( void ) const;
 
+    // Image filename to read or write
+    void            file ( FILE *file_ );
+    FILE*           file ( void ) const;
+
     // Image filename to read or write
     void            fileName ( const std::string &fileName_ );
     std::string     fileName ( void ) const;

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 5bae6c6d7231302bc4820513ea5c7d034541a919..a9cd5258b381ade0a3d83763dd1421961b892ee9 100644 (file)
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -228,6 +228,15 @@ Magick::EndianType Magick::Options::endian ( void ) const
   return _imageInfo->endian;
 }
 
+void Magick::Options::file ( FILE *file_ )
+{
+  SetImageInfoFile(_imageInfo, file_ );
+}
+FILE *Magick::Options::file ( void ) const
+{
+  return _imageInfo->file;
+}
+
 void Magick::Options::fileName ( const std::string &fileName_ )
 {
   fileName_.copy( _imageInfo->filename, MaxTextExtent-1 );

diff --git a/magick/image.c b/magick/image.c
index 58352f34e04db21f9903d1020970722eb40d8fe9..7b3750e0e8ac9b37c54d65efc57753b795a60f3f 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -1569,6 +1569,33 @@ MagickExport void GetImageInfo(ImageInfo *image_info)
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   G e t I m a g e I n f o F i l e                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetImageInfoFile() returns the image info file member.
+%
+%  The format of the GetImageInfoFile method is:
+%
+%      FILE *GetImageInfoFile(const ImageInfo *image_info)
+%
+%  A description of each parameter follows:
+%
+%    o image_info: the image info.
+%
+*/
+MagickExport FILE *GetImageInfoFile(const ImageInfo *image_info)
+{
+  return(image_info->file);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   G e t I m a g e M a s k                                                   %
 %                                                                             %
 %                                                                             %

diff --git a/magick/image.h b/magick/image.h
index 4ba7b70424ca6d80327c791c96757625e1c2b236..254a1936bbc24e92947779cdd642741b180f1d27 100644 (file)
--- a/magick/image.h
+++ b/magick/image.h
@@ -478,6 +478,9 @@ struct _ImageInfo
 extern MagickExport ExceptionType
   CatchImageException(Image *);
 
+extern MagickExport FILE
+  *GetImageInfoFile(const ImageInfo *);
+
 extern MagickExport Image
   *AcquireImage(const ImageInfo *),
   *AppendImages(const Image *,const MagickBooleanType,ExceptionInfo *),