wavelet-commit

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

Update of /cvsroot/wavelet/Wavelet/test
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6309/test

Modified Files:
	imageresizer.cc 
Log Message:
Added a smart option to the ImageResizer, so that it can now do
fully smart cropping.


Index: imageresizer.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/imageresizer.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** imageresizer.cc	7 Aug 2007 17:01:00 -0000	1.1
--- imageresizer.cc	10 Aug 2007 17:55:45 -0000	1.2
***************
*** 34,52 ****
    ColorImage *img = NEW (ColorImage ());
    ColorImage * result;
-   TEST_NO_EXCEPTION (img->read ("prod_18_schuh1.jpg")); // 768x1024
    //TEST_NO_EXCEPTION (img->read ("rita.jpg")); // 768x1024
    //TEST_NO_EXCEPTION (img->read ("christina57.jpg")); // 594x448
    //TEST_NO_EXCEPTION (img->read ("lena128.ppm")); // 128x128
    //int white[3] = { 255, 255, 255 };
    int red[3] = { 255, 0, 0 };
!   ImageResizer ir (*img, Haar, red, 0.001);
    //TEST_NO_EXCEPTION (result = ir.resize(100, 200));
-   TEST_NO_EXCEPTION (result = ir.resize(80, 300));
-   cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
    //TEST_NO_EXCEPTION (result = ir.resize(340, 300));
    //TEST_NO_EXCEPTION (result = ir.resize(64, 64));
    TEST_NO_EXCEPTION (result->write("out.jpg"));
  
!   cout << "Test of class ImageResizer completed successfully.\n";
    return 0;
  
--- 34,67 ----
    ColorImage *img = NEW (ColorImage ());
    ColorImage * result;
    //TEST_NO_EXCEPTION (img->read ("rita.jpg")); // 768x1024
    //TEST_NO_EXCEPTION (img->read ("christina57.jpg")); // 594x448
    //TEST_NO_EXCEPTION (img->read ("lena128.ppm")); // 128x128
    //int white[3] = { 255, 255, 255 };
+ 
+   TEST_NO_EXCEPTION (img->read ("prod_18_schuh1.jpg")); // 300x220
+ 
    int red[3] = { 255, 0, 0 };
! 
!   ImageResizer ir (*img, Haar, red, 0.001, true);
! 
    //TEST_NO_EXCEPTION (result = ir.resize(100, 200));
    //TEST_NO_EXCEPTION (result = ir.resize(340, 300));
    //TEST_NO_EXCEPTION (result = ir.resize(64, 64));
+ 
+   TEST_NO_EXCEPTION (result = ir.resize(80, 300));
+   cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
+ 
    TEST_NO_EXCEPTION (result->write("out.jpg"));
  
!   //TEST_NO_EXCEPTION (result = ir.resize(400, 500));
!   //cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
!   //cout << "Test of class ImageResizer completed successfully.\n";
!   //TEST_NO_EXCEPTION (result->write("aus.jpg"));
! 
!   TEST_NO_EXCEPTION (result = ir.resize(0, 0));
!   cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
!   TEST_NO_EXCEPTION (result->write("aus.jpg"));
! 
! 
    return 0;