[Boost-commit] svn:boost r82092 - in trunk: boost/gil libs/gil/test

Subject: [Boost-commit] svn:boost r82092 - in trunk: boost/gil libs/gil/test
From: marshall_at_[hidden]
Date: 2012-12-19 00:09:06

Author: marshall
Date: 2012-12-19 00:09:05 EST (Wed, 19 Dec 2012)
New Revision: 82092
URL: http://svn.boost.org/trac/boost/changeset/82092

Log:
Apply patch for Lubomir; Refs #4919
Text files modified: 
   trunk/boost/gil/gil_concept.hpp        |    14 ++++++++------                          
   trunk/libs/gil/test/pixel_iterator.cpp |    16 ++++++++--------                        
   2 files changed, 16 insertions(+), 14 deletions(-)

Modified: trunk/boost/gil/gil_concept.hpp
==============================================================================
--- trunk/boost/gil/gil_concept.hpp	(original)
+++ trunk/boost/gil/gil_concept.hpp	2012-12-19 00:09:05 EST (Wed, 19 Dec 2012)
@@ -272,8 +272,7 @@
         LT lt=axis_value<N-1>(point);
         axis_value<N-1>(point)=lt;
     
-        value_type v=point[0];  ignore_unused_variable_warning(v);
-        point[0]=point[0];
+//        value_type v=point[0];  ignore_unused_variable_warning(v);
     }
     P point;
 };
@@ -456,11 +455,12 @@
     template <typename T>
     struct ChannelIsMutableConcept {
         void constraints() {
-            c=c;
+            c1=c2;
             using std::swap;
-            swap(c,c);
+            swap(c1,c2);
         }
-        T c;
+        T c1;
+        T c2;
     };
 }
 
@@ -951,8 +951,10 @@
     void constraints() {
         gil_function_requires<HomogeneousPixelConcept<P> >();
         gil_function_requires<MutableHomogeneousColorBaseConcept<P> >();
-        p[0]=p[0];
+        p[0]=v;
+        v=p[0];
     }
+	typename P::template element_type<P>::type v;
     P p;
 };
 

Modified: trunk/libs/gil/test/pixel_iterator.cpp
==============================================================================
--- trunk/libs/gil/test/pixel_iterator.cpp	(original)
+++ trunk/libs/gil/test/pixel_iterator.cpp	2012-12-19 00:09:05 EST (Wed, 19 Dec 2012)
@@ -147,14 +147,14 @@
     unsigned char v8 = get_color( p8, gray_color_t() );
 
         // all values should be 110b ( 6 );
-    //assert( v1 == 6 );
-    //assert( v2 == 6 );
-    //assert( v3 == 6 );
-    //assert( v4 == 6 );
-    //assert( v5 == 6 );
-    //assert( v6 == 6 );
-    //assert( v7 == 6 );
-    //assert( v8 == 6 );
+    assert( v1 == 6 );
+    assert( v2 == 6 );
+    assert( v3 == 6 );
+    assert( v4 == 6 );
+    assert( v5 == 6 );
+    assert( v6 == 6 );
+    assert( v7 == 6 );
+    assert( v8 == 6 );
 }
 
 // TODO: Make better tests. Use some code from below.