← Back to branch summary

~ubuntu-branches/ubuntu/natty/imagemagick/natty-updates

« back to all changes in this revision

Viewing changes to Magick++/tests/montageImages.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Nelson A. de Oliveira
  • Date: 2010-06-20 19:59:55 UTC
  • mfrom: (6.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100620195955-n3eq0yenhycw888i
Tags: 7:6.6.2.6-1
http://bugs.debian.org/579775
http://bugs.debian.org/582073
http://bugs.debian.org/583024
* New upstream release;
* Change Recommends on ufraw to ufraw-batch (Closes: #579775);
* Fix FTBFS when using dash to run the configure script, by setting
  CONFIG_SHELL=/bin/bash (Closes: #582073, #583024). Thank you, Niko Tyni!

Show diffs side-by-side

added added

removed removed

Lines of Context:
Magick++/tests/montageImages.cpp
44
44
    montageImages( &montage, imageList.begin(), imageList.end(), montageOpts );
45
45
 
46
46
    {
47
 
      Geometry targetGeometry(128, 126 );
 
47
      Geometry targetGeometry(120, 120 );
48
48
      if ( montage[0].montageGeometry() != targetGeometry )
49
49
        {
50
50
          ++failures;
58
58
        }
59
59
    }
60
60
 
61
 
    if ( montage[0].columns() != 768 || montage[0].rows() != 504 )
 
61
    if ( montage[0].columns() != 720 || montage[0].rows() != 480 )
62
62
      {
63
63
        ++failures;
64
64
        cout << "Line: " << __LINE__ 
93
93
      }
94
94
 
95
95
    {
96
 
      Geometry targetGeometry( 66, 70 );
 
96
      Geometry targetGeometry( 62, 66 );
97
97
      if ( montage[0].montageGeometry() != targetGeometry )
98
98
        {
99
99
          ++failures;
107
107
        }
108
108
    }
109
109
 
110
 
    if ( montage[0].columns() != 136 || montage[0].rows() != 70 )
 
110
    if ( montage[0].columns() != 128 || montage[0].rows() != 66 )
111
111
      {
112
112
        ++failures;
113
113
        cout << "Line: " << __LINE__