[Boost-commit] svn:boost r84091 - trunk/libs/gil/toolbox/test

Subject: [Boost-commit] svn:boost r84091 - trunk/libs/gil/toolbox/test
From: chhenning_at_[hidden]
Date: 2013-04-30 08:02:28

Author: chhenning
Date: 2013-04-30 08:02:28 EDT (Tue, 30 Apr 2013)
New Revision: 84091
URL: http://svn.boost.org/trac/boost/changeset/84091

Log:
More tests for subchroma image.
Text files modified: 
   trunk/libs/gil/toolbox/test/subchroma_image.cpp |    89 +++++++++++---------------------------- 
   1 files changed, 25 insertions(+), 64 deletions(-)

Modified: trunk/libs/gil/toolbox/test/subchroma_image.cpp
==============================================================================
--- trunk/libs/gil/toolbox/test/subchroma_image.cpp	(original)
+++ trunk/libs/gil/toolbox/test/subchroma_image.cpp	2013-04-30 08:02:28 EDT (Tue, 30 Apr 2013)
@@ -18,68 +18,31 @@
 
 BOOST_AUTO_TEST_SUITE( toolbox_tests )
 
-template< int J, int a, int b >
-struct foo
+BOOST_AUTO_TEST_CASE( subchroma_image_test )
 {
-    BOOST_STATIC_ASSERT(( mpl::equal_to< mpl::int_< J >, mpl::int_< 4 > >::type::value ));
-
-    BOOST_STATIC_ASSERT(( mpl::or_< mpl::equal_to< mpl::int_< a >, mpl::int_< 4 > >
-                                  , mpl::or_< mpl::equal_to< mpl::int_< a >, mpl::int_< 2 > >
-                                            , mpl::equal_to< mpl::int_< a >, mpl::int_< 1 > >
-                                            >
-                                  >::type::value
-                       )); 
-
-    BOOST_STATIC_ASSERT(( mpl::or_< mpl::equal_to< mpl::int_< b >, mpl::int_< 4 > >
-                                  , mpl::or_< mpl::equal_to< mpl::int_< b >, mpl::int_< 2 > >
-                                            , mpl::or_< mpl::equal_to< mpl::int_< b >, mpl::int_< 1 > >
-                                                      , mpl::equal_to< mpl::int_< b >, mpl::int_< 0 > >
-                                                      >
-                                            >
-                                  >::type::value
-                       )); 
-
-    BOOST_STATIC_CONSTANT( int, ss_X = ( mpl::divides< mpl::int_< J >
-                                                     , mpl::int_< a >
-                                                     >::type::value )
-                         );
-
-    BOOST_STATIC_CONSTANT( int, ss_Y = ( mpl::if_< mpl::equal_to< mpl::int_< b >, mpl::int_< 0 > >
-                                                 , mpl::int_< 2 >
-                                                 , mpl::if_< mpl::equal_to< mpl::int_< a >, mpl::int_< b > >
-                                                           , mpl::int_< 1 >
-                                                           , mpl::int_< 4 >
-                                                           >::type
-                                                 >::type::value )
-                         );
-};
+    {
+        ycbcr_601_8_pixel_t a( 10, 20, 30 );
+        rgb8_pixel_t b;
+        bgr8_pixel_t c;
+
+        color_convert( a, b );
+        color_convert( a, c );
+        BOOST_ASSERT( static_equal( b, c ));
 
+        color_convert( b, a );
+    }
 
-BOOST_AUTO_TEST_CASE( subchroma_image_test )
-{
-    //{
-    //    ycbcr_601_8_pixel_t a( 10, 20, 30 );
-    //    rgb8_pixel_t b;
-    //    bgr8_pixel_t c;
-
-    //    color_convert( a, b );
-    //    color_convert( a, c );
-    //    BOOST_ASSERT( static_equal( b, c ));
-
-    //    color_convert( b, a );
-    //}
-
-    //{
-    //    ycbcr_709_8_pixel_t a( 10, 20, 30 );
-    //    rgb8_pixel_t b;
-    //    bgr8_pixel_t c;
-
-    //    color_convert( a, b );
-    //    color_convert( a, c );
-    //    BOOST_ASSERT( static_equal( b, c ));
+    {
+        ycbcr_709_8_pixel_t a( 10, 20, 30 );
+        rgb8_pixel_t b;
+        bgr8_pixel_t c;
+
+        color_convert( a, b );
+        color_convert( a, c );
+        BOOST_ASSERT( static_equal( b, c ));
 
-    //    color_convert( b, a );
-    //}
+        color_convert( b, a );
+    }
 
     {
         typedef rgb8_pixel_t pixel_t;
@@ -125,14 +88,12 @@
 
         vector< unsigned char > data( image_size );
 
-        image_t::view_t v = subsampled_view< pixel_t, factors_t >( y_width
-                                                                 , y_height
-                                                                 , &data.front()
-                                                                 );
+        image_t::view_t v = subchroma_view< pixel_t, factors_t >( y_width
+                                                                , y_height
+                                                                , &data.front()
+                                                                );
         rgb8_pixel_t p = *v.xy_at( 0, 0 );
     }
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-
-