[Boost-commit] svn:boost r83635 - trunk/libs/gil/numeric/test

Subject: [Boost-commit] svn:boost r83635 - trunk/libs/gil/numeric/test
From: chhenning_at_[hidden]
Date: 2013-03-29 17:36:21

Author: chhenning
Date: 2013-03-29 17:36:20 EDT (Fri, 29 Mar 2013)
New Revision: 83635
URL: http://svn.boost.org/trac/boost/changeset/83635

Log:
Added test cases for pixel by pixel multiplication and division.
Text files modified: 
   trunk/libs/gil/numeric/test/numeric.cpp |   153 ++++++++++++++++++++++++++++++--------- 
   1 files changed, 117 insertions(+), 36 deletions(-)

Modified: trunk/libs/gil/numeric/test/numeric.cpp
==============================================================================
--- trunk/libs/gil/numeric/test/numeric.cpp	(original)
+++ trunk/libs/gil/numeric/test/numeric.cpp	2013-03-29 17:36:20 EDT (Fri, 29 Mar 2013)
@@ -15,14 +15,15 @@
 
 #include <boost/test/unit_test.hpp>
 
-namespace gil = boost::gil;
+using namespace boost;
+using namespace gil;
 
 template < class F, class I >
 struct TestMapFn
 {
-    typedef gil::point2<F> point_t;
+    typedef point2<F> point_t;
     typedef point_t result_type;
-    result_type operator()( gil::point2<I> const& src ) const
+    result_type operator()( point2<I> const& src ) const
     {
         F x = static_cast<F>( src.x ) - 0.5;
         F y = static_cast<F>( src.y ) - 0.5;
@@ -54,44 +55,124 @@
 
 BOOST_AUTO_TEST_SUITE(Numeric_Tests)
 
+BOOST_AUTO_TEST_CASE( pixel_numeric_operations_plus )
+{
+    rgb8_pixel_t a( 10, 20, 30 );
+    bgr8_pixel_t b( 30, 20, 10 );
+
+    pixel_plus_t< rgb8_pixel_t
+                , bgr8_pixel_t
+                , rgb8_pixel_t
+                > op;
+    rgb8_pixel_t c = op( a, b );
+
+    BOOST_ASSERT( get_color( c, red_t()   ) == 20 );
+    BOOST_ASSERT( get_color( c, green_t() ) == 40 );
+    BOOST_ASSERT( get_color( c, blue_t()  ) == 60 );
+
+    pixel_plus_t< rgb8_pixel_t
+                , bgr8_pixel_t
+                , bgr8_pixel_t
+                > op2;
+    bgr8_pixel_t d = op2( a, b );
+
+    BOOST_ASSERT( get_color( d, red_t()   ) == 20 );
+    BOOST_ASSERT( get_color( d, green_t() ) == 40 );
+    BOOST_ASSERT( get_color( d, blue_t()  ) == 60 );
+}
+
+BOOST_AUTO_TEST_CASE( pixel_numeric_operations_multiply )
+{
+    rgb32f_pixel_t a( 1.f, 2.f, 3.f );
+    bgr32f_pixel_t b( 2.f, 2.f, 2.f );
+
+    pixel_multiply_t< rgb32f_pixel_t
+                    , bgr32f_pixel_t
+                    , rgb32f_pixel_t
+                    > op;
+    rgb32f_pixel_t c = op( a, b );
+
+    float epsilon = 1e-6f;
+    BOOST_CHECK_CLOSE( static_cast<float>( get_color( c,   red_t() )), 2.f, epsilon );
+    BOOST_CHECK_CLOSE( static_cast<float>( get_color( c, green_t() )), 4.f, epsilon );
+    BOOST_CHECK_CLOSE( static_cast<float>( get_color( c,  blue_t() )), 6.f, epsilon );
+}
+
+BOOST_AUTO_TEST_CASE( pixel_numeric_operations_divide )
+{
+    // integer
+    {
+        rgb8_pixel_t a( 10, 20, 30 );
+        bgr8_pixel_t b(  2,  2,  2 );
+
+        pixel_divide_t< rgb8_pixel_t
+                      , bgr8_pixel_t
+                      , rgb8_pixel_t
+                      > op;
+        rgb32f_pixel_t c = op( a, b );
+
+        float epsilon = 1e-6f;
+        BOOST_ASSERT( get_color( c,   red_t() ) ==  5 );
+        BOOST_ASSERT( get_color( c, green_t() ) == 10 );
+        BOOST_ASSERT( get_color( c,  blue_t() ) == 15 );
+    }
+
+    // float
+    {
+        rgb32f_pixel_t a( 1.f, 2.f, 3.f );
+        bgr32f_pixel_t b( 2.f, 2.f, 2.f );
+
+        pixel_divide_t< rgb32f_pixel_t
+                      , bgr32f_pixel_t
+                      , rgb32f_pixel_t
+                      > op;
+        rgb32f_pixel_t c = op( a, b );
+
+        float epsilon = 1e-6f;
+        BOOST_CHECK_CLOSE( static_cast< float >( get_color( c,   red_t() )), 0.5f, epsilon );
+        BOOST_CHECK_CLOSE( static_cast< float >( get_color( c, green_t() )),  1.f, epsilon );
+        BOOST_CHECK_CLOSE( static_cast< float >( get_color( c,  blue_t() )), 1.5f, epsilon );
+    }
+}
+
 BOOST_AUTO_TEST_CASE(bilinear_sampler_test)
 {
     // R G B
     // G W R
     // B R G
-    gil::rgb8_image_t img(3,3);
-    gil::rgb8_view_t v = view(img);
-    v(0,0) = v(1,2) = v(2,1) = gil::rgb8_pixel_t(128,0,0);
-    v(0,1) = v(1,0) = v(2,2) = gil::rgb8_pixel_t(0,128,0);
-    v(0,2) = v(2,0) = gil::rgb8_pixel_t(0,0,128);
-    v(1,1) = gil::rgb8_pixel_t(128,128,128);
-
-    gil::rgb8_image_t dimg(4,4);
-    gil::rgb8c_view_t dv = const_view(dimg);
-
-    TestMapFn<double,gil::rgb8_image_t::coord_t> mf;
-
-    gil::resample_pixels( const_view(img), view(dimg), mf, gil::bilinear_sampler() );
-
-    assert( gil::rgb8_pixel_t(128,0,0) == dv(0,0) );
-    assert( gil::rgb8_pixel_t(64,64,0) == dv(0,1) );
-    assert( gil::rgb8_pixel_t(0,64,64) == dv(0,2) );
-    assert( gil::rgb8_pixel_t(0,0,128) == dv(0,3) );
-
-    assert( gil::rgb8_pixel_t(64,64,0) == dv(1,0) );
-    assert( gil::rgb8_pixel_t(64,96,32) == dv(1,1) );
-    assert( gil::rgb8_pixel_t(64,64,64) == dv(1,2) );
-    assert( gil::rgb8_pixel_t(64,0,64) == dv(1,3) );
-
-    assert( gil::rgb8_pixel_t(0,64,64) == dv(2,0) );
-    assert( gil::rgb8_pixel_t(64,64,64) == dv(2,1) );
-    assert( gil::rgb8_pixel_t(96,64,32) == dv(2,2) );
-    assert( gil::rgb8_pixel_t(64,64,0) == dv(2,3) );
-
-    assert( gil::rgb8_pixel_t(0,0,128) == dv(3,0) );
-    assert( gil::rgb8_pixel_t(64,0,64) == dv(3,1) );
-    assert( gil::rgb8_pixel_t(64,64,0) == dv(3,2) );
-    assert( gil::rgb8_pixel_t(0,128,0) == dv(3,3) );
+    rgb8_image_t img(3,3);
+    rgb8_view_t v = view(img);
+    v(0,0) = v(1,2) = v(2,1) = rgb8_pixel_t(128,0,0);
+    v(0,1) = v(1,0) = v(2,2) = rgb8_pixel_t(0,128,0);
+    v(0,2) = v(2,0) = rgb8_pixel_t(0,0,128);
+    v(1,1) = rgb8_pixel_t(128,128,128);
+
+    rgb8_image_t dimg(4,4);
+    rgb8c_view_t dv = const_view(dimg);
+
+    TestMapFn<double,rgb8_image_t::coord_t> mf;
+
+    resample_pixels( const_view(img), view(dimg), mf, bilinear_sampler() );
+
+    assert( rgb8_pixel_t(128,0,0) == dv(0,0) );
+    assert( rgb8_pixel_t(64,64,0) == dv(0,1) );
+    assert( rgb8_pixel_t(0,64,64) == dv(0,2) );
+    assert( rgb8_pixel_t(0,0,128) == dv(0,3) );
+
+    assert( rgb8_pixel_t(64,64,0) == dv(1,0) );
+    assert( rgb8_pixel_t(64,96,32) == dv(1,1) );
+    assert( rgb8_pixel_t(64,64,64) == dv(1,2) );
+    assert( rgb8_pixel_t(64,0,64) == dv(1,3) );
+
+    assert( rgb8_pixel_t(0,64,64) == dv(2,0) );
+    assert( rgb8_pixel_t(64,64,64) == dv(2,1) );
+    assert( rgb8_pixel_t(96,64,32) == dv(2,2) );
+    assert( rgb8_pixel_t(64,64,0) == dv(2,3) );
+
+    assert( rgb8_pixel_t(0,0,128) == dv(3,0) );
+    assert( rgb8_pixel_t(64,0,64) == dv(3,1) );
+    assert( rgb8_pixel_t(64,64,0) == dv(3,2) );
+    assert( rgb8_pixel_t(0,128,0) == dv(3,3) );
 }
 
 BOOST_AUTO_TEST_SUITE_END()