Ticket #4919: gil.patch
File gil.patch, 2.0 KB (added by , 10 years ago) |
---|
-
Users/mclow/Projects/boost/trunk/boost/gil/gil_concept.hpp
272 272 LT lt=axis_value<N-1>(point); 273 273 axis_value<N-1>(point)=lt; 274 274 275 value_type v=point[0]; ignore_unused_variable_warning(v); 276 point[0]=point[0]; 275 // value_type v=point[0]; ignore_unused_variable_warning(v); 277 276 } 278 277 P point; 279 278 }; … … 456 455 template <typename T> 457 456 struct ChannelIsMutableConcept { 458 457 void constraints() { 459 c =c;458 c1=c2; 460 459 using std::swap; 461 swap(c ,c);460 swap(c1,c2); 462 461 } 463 T c; 462 T c1; 463 T c2; 464 464 }; 465 465 } 466 466 … … 951 951 void constraints() { 952 952 gil_function_requires<HomogeneousPixelConcept<P> >(); 953 953 gil_function_requires<MutableHomogeneousColorBaseConcept<P> >(); 954 p[0]=p[0]; 954 p[0]=v; 955 v=p[0]; 955 956 } 957 typename P::template element_type<P>::type v; 956 958 P p; 957 959 }; 958 960 -
Users/mclow/Projects/boost/trunk/libs/gil/test/pixel_iterator.cpp
147 147 unsigned char v8 = get_color( p8, gray_color_t() ); 148 148 149 149 // all values should be 110b ( 6 ); 150 //assert( v1 == 6 );151 //assert( v2 == 6 );152 //assert( v3 == 6 );153 //assert( v4 == 6 );154 //assert( v5 == 6 );155 //assert( v6 == 6 );156 //assert( v7 == 6 );157 //assert( v8 == 6 );150 assert( v1 == 6 ); 151 assert( v2 == 6 ); 152 assert( v3 == 6 ); 153 assert( v4 == 6 ); 154 assert( v5 == 6 ); 155 assert( v6 == 6 ); 156 assert( v7 == 6 ); 157 assert( v8 == 6 ); 158 158 } 159 159 160 160 // TODO: Make better tests. Use some code from below.