Update of /cvsroot/wavelet/Wavelet
In directory vz-cvs-4.sog:/tmp/cvs-serv17474
Modified Files:
ImageComparison.cc MagickInter.cc
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: MagickInter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MagickInter.cc 27 May 2010 15:37:15 -0000 1.8
--- MagickInter.cc 17 Nov 2011 20:05:51 -0000 1.9
***************
*** 15,18 ****
--- 15,19 ----
#include <Magick++.h>
+ //using MagickLib::Quantum;
//using namespace MagickLib;
Index: ImageComparison.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageComparison.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ImageComparison.cc 15 Jul 2009 15:44:54 -0000 1.12
--- ImageComparison.cc 17 Nov 2011 20:05:51 -0000 1.13
***************
*** 7,10 ****
--- 7,11 ----
*/
+ #include "Wave/PyramidTransform.hh"
#include "Wave/StandardTransform.hh"
#include "WTools/ImageComparison.hh"
***************
*** 249,256 ****
Image *
ImageComparison::truncateForLq (const Image &image, double percent,
! FilterSet &flt)
{
int nKeptCoeffs = (int)((double)(image.size () * percent) / 100.0);
! return truncateForLq (image, nKeptCoeffs, flt);
}
--- 250,257 ----
Image *
ImageComparison::truncateForLq (const Image &image, double percent,
! FilterSet &flt, const decomp t)
{
int nKeptCoeffs = (int)((double)(image.size () * percent) / 100.0);
! return truncateForLq (image, nKeptCoeffs, flt, t);
}
***************
*** 317,326 ****
Image *
! ImageComparison::truncateForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt)
{
Image *result = image.clone ();
! WaveletTransform *transform = NEW (StandardTransform (*result, flt));
transform->analysis (0);
DELETE (transform);
--- 318,329 ----
Image *
! ImageComparison::truncateForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t)
{
Image *result = image.clone ();
! WaveletTransform *transform = t == STANDARD
! ? (WaveletTransform*)NEW (StandardTransform (*result, flt))
! : (WaveletTransform*)NEW (PyramidTransform (*result, flt));
transform->analysis (0);
DELETE (transform);
***************
*** 360,369 ****
ImageInformation *
! ImageComparison::imageInfoForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt)
{
Image *tmp = image.clone ();
! WaveletTransform *transform = NEW (StandardTransform (*tmp, flt));
transform->analysis (0);
DELETE (transform);
--- 363,374 ----
ImageInformation *
! ImageComparison::imageInfoForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t)
{
Image *tmp = image.clone ();
! WaveletTransform *transform = t == STANDARD
! ? (WaveletTransform*)NEW (StandardTransform (*tmp, flt))
! : (WaveletTransform*)NEW (PyramidTransform (*tmp, flt));
transform->analysis (0);
DELETE (transform);
|
