[Wavelet-commit] Wavelet/WTools ImageComparison.hh,1.6,1.7

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

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

Modified Files:
	ImageComparison.hh 
Log Message:
Fixed a minor bug in the ColorImage's fitInto() method.


Index: ImageComparison.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ImageComparison.hh	12 Apr 2009 16:57:53 -0000	1.6
--- ImageComparison.hh	13 Apr 2009 19:29:38 -0000	1.7
***************
*** 12,15 ****
--- 12,16 ----
  #include "WImage/Image.hh"
  #include "Wave/Filter.hh"
+ #include "WTools/ImageInformation.hh"
  
  /** 
***************
*** 126,130 ****
     * the relative number of Wavelet coefficients to keep
     * @param flt
!    * the filter to use */
    static Image *truncateForLq (const Image &image,
  			       double percent, FilterSet &flt);
--- 127,132 ----
     * the relative number of Wavelet coefficients to keep
     * @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);
***************
*** 136,142 ****
     * the absolute number of Wavelet coefficients to keep
     * @param flt
!    * the filter to use */
    static Image *truncateForLq (const Image &image,
  			       int nKeptCoeffs, FilterSet &flt);
  protected:
    /** Number of rows. */
--- 138,157 ----
     * the absolute number of Wavelet coefficients to keep
     * @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.
+    * @param image
+    * the image
+    * @param nKeptCoeffs
+    * the absolute number of Wavelet coefficients to keep
+    * @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);
  protected:
    /** Number of rows. */