From 15781e5110c893ce0eb7924926ae0d1a056f90eb Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 5 Dec 2009 23:05:27 +0000 Subject: [PATCH] --- Magick++/lib/Magick++/Include.h | 2 ++ Magick++/lib/Magick++/Options.h | 4 ++++ Magick++/lib/Options.cpp | 9 +++++++++ magick/image.c | 27 +++++++++++++++++++++++++++ magick/image.h | 3 +++ 5 files changed, 45 insertions(+) diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index 6ca86c9af..8b70f5d3b 100644 --- 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 1e308dbec..47136f467 100644 --- 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 5bae6c6d7..a9cd5258b 100644 --- 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 58352f34e..7b3750e0e 100644 --- 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); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % G e t I m a g e M a s k % % % % % diff --git a/magick/image.h b/magick/image.h index 4ba7b7042..254a1936b 100644 --- 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 *), -- 2.40.0