[Wavelet-commit] Wavelet/WImage Image.hh,1.13,1.14

[Johan H. E. <bo...@us...>]

Update of /cvsroot/wavelet/Wavelet/WImage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20708/WImage

Modified Files:
	Image.hh 
Log Message:
Image class:
Gamma correction now also has ability to work on other predefined normalization ranges oppose to default range of (0..255.).

Index: Image.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/Image.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Image.hh	13 Jul 2005 13:55:53 -0000	1.13
--- Image.hh	14 Jul 2005 17:06:19 -0000	1.14
***************
*** 151,158 ****
    /** Perform a gamma correction. Since this is normally only defined for the 
     * spatial domain (the pixels need to be normalized) the normalization factor
!    * is assumed to be 255, but only if all values found in the image are within
!    * the [0..255] range. If they are not, a normalization factor is 
     * automatically calculated as the difference between the image's maximum 
!    * and minimum coefficient value.
     * @param factor
     * the gamma factor (0..1.0)
--- 151,159 ----
    /** Perform a gamma correction. Since this is normally only defined for the 
     * spatial domain (the pixels need to be normalized) the normalization factor
!    * is set to 255 by default, if values are found in the image outside the
!    * specified [0..norm] range, the range will be increased.
!    * If the range is increased a new normalization factor is 
     * automatically calculated as the difference between the image's maximum 
!    * (if more than norm) and minimum (if less than 0) coefficient value.
     * @param factor
     * the gamma factor (0..1.0)
***************
*** 164,170 ****
     * the horizontal offset of the region to process
     * @param xoffs 
!    * the vertical offset of the region to process */
    virtual void gammaCorrection (double factor, int yoffs = 0, int xoffs = 0,
!                                 int ysize = -1, int xsize = -1);
    
    /** Does a automatic gamma correction. This function breaks the image up into
--- 165,174 ----
     * the horizontal offset of the region to process
     * @param xoffs 
!    * the vertical offset of the region to process 
!    * @param norm
!    * the normalization factor ( default = 255 )*/
    virtual void gammaCorrection (double factor, int yoffs = 0, int xoffs = 0,
!                                 int ysize = -1, int xsize = -1, 
! 				int norm = 255);
    
    /** Does a automatic gamma correction. This function breaks the image up into
***************
*** 187,195 ****
     *  @param xsize 
     *  Horizontal size
     *  @return 
     *  the gamma value - (use it to undo operation if needed) */
    double gammaCorrectionAuto ( int row , int columns , int yoffs = 0 , 
! 			       int xoffs = 0 , int ysize = -1 , 
! 			       int xsize = -1 );
    
    /** Perform a histogram equalisation.
--- 191,200 ----
     *  @param xsize 
     *  Horizontal size
+    *  @param norm
+    *  the normalization factor ( default = 255 )
     *  @return 
     *  the gamma value - (use it to undo operation if needed) */
    double gammaCorrectionAuto ( int row , int columns , int yoffs = 0 , 
! 			       int xoffs = 0 , int ysize = -1 ,int xsize = -1,int norm = 255);
    
    /** Perform a histogram equalisation.