[Wavelet-commit] Wavelet/WImage MagickInter.hh,1.1,1.2

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet/WImage
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv415/WImage

Modified Files:
	MagickInter.hh 
Log Message:
Added option to automatically set the color of transparent
pixels to either black of white in MagickInter.


Index: MagickInter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/MagickInter.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MagickInter.hh	17 Apr 2008 07:27:35 -0000	1.1
--- MagickInter.hh	1 Sep 2009 12:54:18 -0000	1.2
***************
*** 15,19 ****
  
  #include <WImage/ColorImage.hh>
! #include <Magick++/Image.h>
  
  /**
--- 15,22 ----
  
  #include <WImage/ColorImage.hh>
! 
! namespace Magick {
!   class Image;
! }
  
  /**
***************
*** 27,30 ****
--- 30,39 ----
  namespace MagickInter
  {
+   typedef enum {
+     NONE,
+     WHITE,
+     BLACK
+   } TransparencyBackground;
+ 
    /**
     * Converts a ColorImage to a Magick::Image.
***************
*** 73,79 ****
  
    /**
!    * Creates a ColorImage object for an image in the file system using the Magick
!    * classes.
     * @param inFile the input file name
     * @return an auto_ptr to the new ColorImage
     * @exception ios_base:failure if an I/O operation did not succeed (e.g.
--- 82,90 ----
  
    /**
!    * Creates a ColorImage object for an image in the file system using the
!    * Magick classes.
     * @param inFile the input file name
+    * @param transparencyBackground if not NONE, enforce WHITE or BLACK for
+    * pixels marked as transparent in the image
     * @return an auto_ptr to the new ColorImage
     * @exception ios_base:failure if an I/O operation did not succeed (e.g.
***************
*** 82,86 ****
     * format etc.)
     */
!   std::auto_ptr<ColorImage> obtainColorImage (const std::string &inFile);
  
    /**
--- 93,99 ----
     * format etc.)
     */
!   std::auto_ptr<ColorImage> obtainColorImage (const std::string &inFile,
! 					      const TransparencyBackground
! 					      &transparencyBackground = NONE);
  
    /**