wavelet-commit

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

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

Modified Files:
	imageresizer.cc prod_18_schuh1.jpg 
Log Message:
Crash fix in waveppm, bugfix in Image::variance(), minor
polishin on imageresizer test.


Index: imageresizer.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/imageresizer.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imageresizer.cc	10 Aug 2007 17:55:45 -0000	1.2
--- imageresizer.cc	15 Aug 2007 13:13:58 -0000	1.3
***************
*** 39,43 ****
    //int white[3] = { 255, 255, 255 };
  
!   TEST_NO_EXCEPTION (img->read ("prod_18_schuh1.jpg")); // 300x220
  
    int red[3] = { 255, 0, 0 };
--- 39,43 ----
    //int white[3] = { 255, 255, 255 };
  
!   TEST_NO_EXCEPTION (img->read ("prod_18_schuh1.jpg")); // 300x280
  
    int red[3] = { 255, 0, 0 };
***************
*** 52,56 ****
    cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
  
!   TEST_NO_EXCEPTION (result->write("out.jpg"));
  
    //TEST_NO_EXCEPTION (result = ir.resize(400, 500));
--- 52,57 ----
    cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
  
!   TEST_NO_EXCEPTION (result->write("rescaled.jpg"));
!   DELETE (result);
  
    //TEST_NO_EXCEPTION (result = ir.resize(400, 500));
***************
*** 61,65 ****
    TEST_NO_EXCEPTION (result = ir.resize(0, 0));
    cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
!   TEST_NO_EXCEPTION (result->write("aus.jpg"));
  
  
--- 62,71 ----
    TEST_NO_EXCEPTION (result = ir.resize(0, 0));
    cout << "score: " << 20000 * ir.getInnerAvgPerSize () << endl;
!   TEST_NO_EXCEPTION (result->write("autocropped.jpg"));
!   DELETE (result);
! 
!   TEST_NO_EXCEPTION (result = img->fitInto (80, 300, red));
!   TEST_NO_EXCEPTION (result->write("simple.jpg"));
!   DELETE (result);
  
  

Index: prod_18_schuh1.jpg
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/test/prod_18_schuh1.jpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsuSmLrM and /tmp/cvs0d4o7O differ