[Wavelet-commit] Wavelet/WTools ImageComparison.hh,1.9,1.10

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

Update of /cvsroot/wavelet/Wavelet/WTools
In directory vz-cvs-4.sog:/tmp/cvs-serv17474/WTools

Modified Files:
	ImageComparison.hh 
Log Message:
Small extension to ImageComparison: the L_q-related truncation functions now accept an optional parameter for the type of the 2-dimensional decomposition.


Index: ImageComparison.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ImageComparison.hh	15 Jul 2009 15:44:55 -0000	1.9
--- ImageComparison.hh	17 Nov 2011 20:05:51 -0000	1.10
***************
*** 21,24 ****
--- 21,26 ----
  typedef enum { DRAWN = 0, SCANNED } imgtype;
  
+ /** The type of transform used for some operations. */
+ typedef enum { PYRAMID = 0, STANDARD } decomp;
  
  /** A data structure for an $L^q$ norm. */
***************
*** 131,137 ****
     * @param flt
     * the filter to use
     * @return an image of overall average and truncated coeffs */
!   static Image *truncateForLq (const Image &image,
! 			       double percent, FilterSet &flt);
    /**
     * Calculate an $L^q$ detail score for a greyscale image / single color
--- 133,141 ----
     * @param flt
     * the filter to use
+    * @param t
+    * the decomposition type to use (default: Standard)
     * @return an image of overall average and truncated coeffs */
!   static Image *truncateForLq (const Image &image, double percent,
!                                FilterSet &flt, const decomp t = STANDARD);
    /**
     * Calculate an $L^q$ detail score for a greyscale image / single color
***************
*** 174,180 ****
     * @param flt
     * the filter to use 
     * @return an image of overall average and truncated coeffs */
!   static Image *truncateForLq (const Image &image,
! 			       int nKeptCoeffs, FilterSet &flt);
    /**
     * Calculates a feature vector for the $L^q$ and $L^qd$ metrics.
--- 178,186 ----
     * @param flt
     * the filter to use 
+    * @param t
+    * the decomposition type to use (default: Standard)
     * @return an image of overall average and truncated coeffs */
!   static Image *truncateForLq (const Image &image, int nKeptCoeffs,
!                                FilterSet &flt, const decomp t = STANDARD);
    /**
     * Calculates a feature vector for the $L^q$ and $L^qd$ metrics.
***************
*** 185,192 ****
     * @param flt
     * the filter to use
     * @return an image information of overall average the n most significant
     * coeffs sorted by absolute */
!   static ImageInformation *imageInfoForLq (const Image &image,
! 					   int nKeptCoeffs, FilterSet &flt);
  
    /** The number of weights per colour channel. */
--- 191,200 ----
     * @param flt
     * the filter to use
+    * @param t
+    * the decomposition type to use (default: Standard)
     * @return an image information of overall average the n most significant
     * coeffs sorted by absolute */
!   static ImageInformation *imageInfoForLq (const Image &image, int nKeptCoeffs,
!                                            FilterSet &flt, const decomp t = STANDARD);
  
    /** The number of weights per colour channel. */