Fix up image tests.

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 397c8bc9c9468366a724b85c03ed3b4d20e0a22b..0dd32fdec9d874f8ea9c01b61aae1a502c914c42 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -427,9 +427,6 @@ SimpleImage::swap (SimpleImage & other)
 {
        Image::swap (other);
        
-       assert (_size == other._size);
-       assert (_aligned == other._aligned);
-
        std::swap (_size, other._size);
 
        for (int i = 0; i < 4; ++i) {

diff --git a/test/test.cc b/test/test.cc
index a3442b007500117924b88ce7df360210604411d2..d2c58995125681fb26964768f97ce49dd0defbd0 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -551,29 +551,33 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
        BOOST_CHECK (!t->data()[1]);
        BOOST_CHECK (!t->data()[2]);
        BOOST_CHECK (!t->data()[3]);
-       BOOST_CHECK (t->data() != t->data());
-       BOOST_CHECK (t->data()[0] != t->data()[0]);
-       BOOST_CHECK (t->line_size() != t->line_size());
-       BOOST_CHECK (t->line_size()[0] != t->line_size()[0]);
-       BOOST_CHECK (t->stride() != t->stride());
-       BOOST_CHECK (t->stride()[0] != t->stride()[0]);
+       BOOST_CHECK (t->data() != s->data());
+       BOOST_CHECK (t->data()[0] != s->data()[0]);
+       BOOST_CHECK (t->line_size() != s->line_size());
+       BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+       BOOST_CHECK (t->stride() != s->stride());
+       BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
        /* assignment operator */
        SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, Size (150, 150), true);
-       *s = *u;
-       BOOST_CHECK_EQUAL (s->components(), 1);
-       BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
-       BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
-       BOOST_CHECK (s->data()[0]);
-       BOOST_CHECK (!s->data()[1]);
-       BOOST_CHECK (!s->data()[2]);
-       BOOST_CHECK (!s->data()[3]);
-       BOOST_CHECK (s->data() != t->data());
-       BOOST_CHECK (s->data()[0] != t->data()[0]);
-       BOOST_CHECK (s->line_size() != t->line_size());
-       BOOST_CHECK (s->line_size()[0] != t->line_size()[0]);
-       BOOST_CHECK (s->stride() != t->stride());
-       BOOST_CHECK (s->stride()[0] != t->stride()[0]);
+       *u = *s;
+       BOOST_CHECK_EQUAL (u->components(), 1);
+       BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
+       BOOST_CHECK_EQUAL (u->line_size()[0], 50 * 3);
+       BOOST_CHECK (u->data()[0]);
+       BOOST_CHECK (!u->data()[1]);
+       BOOST_CHECK (!u->data()[2]);
+       BOOST_CHECK (!u->data()[3]);
+       BOOST_CHECK (u->data() != s->data());
+       BOOST_CHECK (u->data()[0] != s->data()[0]);
+       BOOST_CHECK (u->line_size() != s->line_size());
+       BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+       BOOST_CHECK (u->stride() != s->stride());
+       BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+
+       delete s;
+       delete t;
+       delete u;
 }
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
@@ -597,27 +601,31 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
        BOOST_CHECK (!t->data()[1]);
        BOOST_CHECK (!t->data()[2]);
        BOOST_CHECK (!t->data()[3]);
-       BOOST_CHECK (t->data() != t->data());
-       BOOST_CHECK (t->data()[0] != t->data()[0]);
-       BOOST_CHECK (t->line_size() != t->line_size());
-       BOOST_CHECK (t->line_size()[0] != t->line_size()[0]);
-       BOOST_CHECK (t->stride() != t->stride());
-       BOOST_CHECK (t->stride()[0] != t->stride()[0]);
+       BOOST_CHECK (t->data() != s->data());
+       BOOST_CHECK (t->data()[0] != s->data()[0]);
+       BOOST_CHECK (t->line_size() != s->line_size());
+       BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+       BOOST_CHECK (t->stride() != s->stride());
+       BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
        /* assignment operator */
        SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, Size (150, 150), false);
-       *s = *u;
-       BOOST_CHECK_EQUAL (s->components(), 1);
-       BOOST_CHECK_EQUAL (s->stride()[0], 160);
-       BOOST_CHECK_EQUAL (s->line_size()[0], 150);
-       BOOST_CHECK (s->data()[0]);
-       BOOST_CHECK (!s->data()[1]);
-       BOOST_CHECK (!s->data()[2]);
-       BOOST_CHECK (!s->data()[3]);
-       BOOST_CHECK (s->data() != t->data());
-       BOOST_CHECK (s->data()[0] != t->data()[0]);
-       BOOST_CHECK (s->line_size() != t->line_size());
-       BOOST_CHECK (s->line_size()[0] != t->line_size()[0]);
-       BOOST_CHECK (s->stride() != t->stride());
-       BOOST_CHECK (s->stride()[0] != t->stride()[0]);
+       *u = *s;
+       BOOST_CHECK_EQUAL (u->components(), 1);
+       BOOST_CHECK_EQUAL (u->stride()[0], 160);
+       BOOST_CHECK_EQUAL (u->line_size()[0], 150);
+       BOOST_CHECK (u->data()[0]);
+       BOOST_CHECK (!u->data()[1]);
+       BOOST_CHECK (!u->data()[2]);
+       BOOST_CHECK (!u->data()[3]);
+       BOOST_CHECK (u->data() != s->data());
+       BOOST_CHECK (u->data()[0] != s->data()[0]);
+       BOOST_CHECK (u->line_size() != s->line_size());
+       BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+       BOOST_CHECK (u->stride() != s->stride());
+       BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+
+       delete s;
+       delete t;
+       delete u;
 }