Changeset 9

Timestamp:

10/26/2008 4:39:47 PM (13 months ago)

Author:

anonymous

Message:

Fixed improper use of GIL ctor.

I was using the 3-argument ctor for the image class, but GIL trats the 3rd arg. as the image alignment instead of the default pixel value. I had to use the 4 arg. ctor.

This issue suggests a testing practice — always assert that the image has the values you think it should to begin with, and never use 0.0f as an initial value since it is too likely to be accidentally correct.

Location:

gilx/trunk

Files:

• options.py (modified) (1 diff)
• src/test/test_gil_image_of_regular_type.cpp (modified) (2 diffs)

gilx/trunk/options.py

@@ +1 @@
+variant = 'all'

gilx/trunk/src/test/test_gil_image_of_regular_type.cpp

@@ -13 +13 @@
 template<class Regular>
 void test_type(){
-    //A single channel type should be both planar and interleaved, so I
-    //am inclined to pass 'true' for planar. Niether option actually compiles.
-
 
     typedef boost::gil::image<float> float_image;
     typedef float_image::view_t float_view;
 
-    float_image img_(256, 256, 0.0f);
+    //NOTE: The last argument is necessary
+    //      -- gil assumes the 3rd arg. is the alignment otherwise.
+    float_image img_(256, 256, 1.0f, 0u);
     float_view img = view(img_);
+
+    //Verify image constructed properly (suggested by Nathan Stien).
+    I3DEA_CHECK_EQUAL(std::count(img.begin(), img.end(), 1.0f), 256*256);
 
     for (int r = 0; r < img.height(); ++r) {
@@ -31 +33 @@
     }
 
-    I3DEA_CHECK_ALMOST_EQUAL(img(128, 128), 3.0f, 0.001);
+    I3DEA_CHECK_EQUAL(img(128, 128), 4.0f);
 
     float_view::locator loc;
     loc = img.xy_at(128, 128);
-    I3DEA_CHECK(*loc == 3.0f);
+    I3DEA_CHECK_EQUAL(*loc, 4.0f);
 }