|
|
Boost : |
Subject: [boost] [gil] gcc 4.4.0 namespace fix (second attempt)
From: Philipp Schwaha (philipp_at_[hidden])
Date: 2009-06-25 17:28:38
Hi!
please excuse if this message is posted twice, but my first attempt
seems to have gone missing ...
I hope this is an appropriate place (and time ;) ) for this.
I found a few namespace issues concerning GIL and gcc 4.4.0 while
working on a
project and have (hopefully) fixed them (patch attached - svn revision
54347).
Cheers,
Philipp
Index: boost/gil/color_base.hpp
===================================================================
--- boost/gil/color_base.hpp (revision 54347)
+++ boost/gil/color_base.hpp (working copy)
@@ -85,7 +85,7 @@
// grayscale pixel values are convertible to channel type
operator Element () const { return _v0; }
- template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,1>& c) : _v0(at_c<0>(c)) {}
+ template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,1>& c) : _v0(gil::at_c<0>(c)) {}
};
@@ -107,13 +107,13 @@
homogeneous_color_base(Element v0, Element v1) : _v0(v0), _v1(v1) {}
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,2>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
// Support for l-value reference proxy copy construction
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,2>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
// Support for planar_pixel_iterator construction and dereferencing
template <typename P> homogeneous_color_base(P* p,bool) :
@@ -155,15 +155,15 @@
homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {}
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,3>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
// Support for l-value reference proxy copy construction
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,3>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
// Support for planar_pixel_iterator construction and dereferencing
template <typename P> homogeneous_color_base(P* p,bool) :
@@ -212,17 +212,17 @@
homogeneous_color_base(Element v0, Element v1, Element v2, Element v3) : _v0(v0), _v1(v1), _v2(v2), _v3(v3) {}
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,4>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
// Support for l-value reference proxy copy construction
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,4>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
// Support for planar_pixel_iterator construction and dereferencing
template <typename P> homogeneous_color_base(P* p,bool) :
@@ -278,19 +278,19 @@
homogeneous_color_base(Element v0, Element v1, Element v2, Element v3, Element v4) : _v0(v0), _v1(v1), _v2(v2), _v3(v3), _v4(v4) {}
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,5>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)),
- _v4(at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)),
+ _v4(gil::at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
// Support for l-value reference proxy copy construction
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,5>& c) :
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)),
- _v4(at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)),
+ _v4(gil::at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
// Support for planar_pixel_iterator construction and dereferencing
template <typename P> homogeneous_color_base(P* p,bool) :
Index: boost/gil/color_base_algorithm.hpp
===================================================================
--- boost/gil/color_base_algorithm.hpp (revision 54347)
+++ boost/gil/color_base_algorithm.hpp (working copy)
@@ -101,7 +101,7 @@
template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
typedef typename kth_element_reference_type<ColorBase,semantic_index>::type type;
- static type get(ColorBase& cb) { return at_c<semantic_index>(cb); }
+ static type get(ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
};
/// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
@@ -109,7 +109,7 @@
template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
typedef typename kth_element_const_reference_type<ColorBase,semantic_index>::type type;
- static type get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
+ static type get(const ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
};
/// \brief A mutable accessor to the K-th semantic element of a color base
Index: boost/gil/pixel.hpp
===================================================================
--- boost/gil/pixel.hpp (revision 54347)
+++ boost/gil/pixel.hpp (working copy)
@@ -143,11 +143,11 @@
private:
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
- template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; }
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; }
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
public:
- pixel& operator= (channel_t chan) { check_gray(); at_c<0>(*this)=chan; return *this; }
- bool operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; }
+ pixel& operator= (channel_t chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
+ bool operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
};
/////////////////////////////
Index: boost/gil/image_view_factory.hpp
===================================================================
--- boost/gil/image_view_factory.hpp (revision 54347)
+++ boost/gil/image_view_factory.hpp (working copy)
@@ -102,7 +102,7 @@
BOOST_STATIC_ASSERT((!is_planar<HomogeneousView>::value && view_is_basic<HomogeneousView>::value));
BOOST_STATIC_ASSERT((boost::is_pointer<typename HomogeneousView::x_iterator>::value));
- return &at_c<0>(view(0,0));
+ return &gil::at_c<0>(view(0,0));
}
/// \ingroup ImageViewConstructors
@@ -430,7 +430,7 @@
typedef typename type::xy_locator locator_t;
typedef typename type::x_iterator x_iterator_t;
typedef typename iterator_adaptor_get_base<x_iterator_t>::type x_iterator_base_t;
- x_iterator_t sit(x_iterator_base_t(&at_c<K>(src(0,0))),src.pixels().pixel_size());
+ x_iterator_t sit(x_iterator_base_t(&gil::at_c<K>(src(0,0))),src.pixels().pixel_size());
return type(src.dimensions(),locator_t(sit, src.pixels().row_size()));
}
};
@@ -444,7 +444,7 @@
typedef typename view_type<channel_t, gray_layout_t, false, false, view_is_mutable<View>::value>::type type;
static type make(const View& src) {
typedef typename type::x_iterator x_iterator_t;
- return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c<K>(src(0,0)), src.pixels().row_size());
+ return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c<K>(src(0,0)), src.pixels().row_size());
}
};
@@ -494,7 +494,7 @@
template <typename P> kth_channel_deref_fn(const kth_channel_deref_fn<K,P>&) {}
result_type operator()(argument_type srcP) const {
- return result_type(at_c<K>(srcP));
+ return result_type(gil::at_c<K>(srcP));
}
};
Index: boost/gil/bit_aligned_pixel_reference.hpp
===================================================================
--- boost/gil/bit_aligned_pixel_reference.hpp (revision 54347)
+++ boost/gil/bit_aligned_pixel_reference.hpp (working copy)
@@ -145,7 +145,7 @@
// Construct from another compatible pixel type
bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {}
- template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&at_c<0>(p)), at_c<0>(p).first_bit()) {
+ template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) {
check_compatible<packed_pixel<BF,CR,Layout> >();
}
@@ -169,8 +169,8 @@
private:
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
- template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); at_c<0>(*this)=chan; }
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); gil::at_c<0>(*this)=chan; }
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
};
/////////////////////////////
Index: boost/gil/gil_concept.hpp
===================================================================
--- boost/gil/gil_concept.hpp (revision 54347)
+++ boost/gil/gil_concept.hpp (working copy)
@@ -618,7 +618,7 @@
typedef typename kth_element_const_reference_type<ColorBase,num_elements-1>::type CR;
#if !defined(_MSC_VER) || _MSC_VER > 1310
- CR cr=at_c<num_elements-1>(cb); ignore_unused_variable_warning(cr);
+ CR cr=gil::at_c<num_elements-1>(cb); ignore_unused_variable_warning(cr);
#endif
// functions that work for every pixel (no need to require them)
@@ -655,8 +655,8 @@
typedef typename kth_element_reference_type<ColorBase, 0>::type CR;
#if !defined(_MSC_VER) || _MSC_VER > 1310
- CR r=at_c<0>(cb);
- at_c<0>(cb)=r;
+ CR r=gil::at_c<0>(cb);
+ gil::at_c<0>(cb)=r;
#endif
}
Index: boost/gil/planar_pixel_iterator.hpp
===================================================================
--- boost/gil/planar_pixel_iterator.hpp (revision 54347)
+++ boost/gil/planar_pixel_iterator.hpp (working copy)
@@ -109,8 +109,8 @@
reference operator->() const { return **this; }
// PERFORMANCE_CHECK: Remove?
- bool operator< (const planar_pixel_iterator& ptr) const { return at_c<0>(*this)< at_c<0>(ptr); }
- bool operator!=(const planar_pixel_iterator& ptr) const { return at_c<0>(*this)!=at_c<0>(ptr); }
+ bool operator< (const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); }
+ bool operator!=(const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); }
private:
friend class boost::iterator_core_access;
@@ -119,8 +119,8 @@
void advance(ptrdiff_t d) { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric<ChannelPtr,ptrdiff_t>(),d)); }
reference dereference() const { return this->template deref<reference>(); }
- ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); }
- bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); }
+ ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }
+ bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); }
};
namespace detail {
@@ -184,7 +184,7 @@
template <typename IC, typename C>
inline std::ptrdiff_t memunit_distance(const planar_pixel_iterator<IC,C>& p1, const planar_pixel_iterator<IC,C>& p2) {
- return memunit_distance(at_c<0>(p1),at_c<0>(p2));
+ return memunit_distance(gil::at_c<0>(p1),gil::at_c<0>(p2));
}
template <typename IC>
Index: boost/gil/packed_pixel.hpp
===================================================================
--- boost/gil/packed_pixel.hpp (revision 54347)
+++ boost/gil/packed_pixel.hpp (working copy)
@@ -77,19 +77,19 @@
template <typename P> packed_pixel(const P& p, typename enable_if_c<is_pixel<P>::value>::type* d=0) { check_compatible<P>(); static_copy(p,*this); }
packed_pixel(int chan0, int chan1) : _bitfield(0) {
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==2));
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1;
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1;
}
packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) {
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==3));
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2;
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2;
}
packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) {
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==4));
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; at_c<3>(*this)=chan3;
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; gil::at_c<3>(*this)=chan3;
}
packed_pixel(int chan0, int chan1, int chan2, int chan3, int chan4) : _bitfield(0) {
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==5));
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2; at_c<3>(*this)=chan3; at_c<4>(*this)=chan4;
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2; gil::at_c<3>(*this)=chan3; gil::at_c<4>(*this)=chan4;
}
packed_pixel& operator=(const packed_pixel& p) { _bitfield=p._bitfield; return *this; }
@@ -106,11 +106,11 @@
// Support for assignment/equality comparison of a channel with a grayscale pixel
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
- template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; }
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; }
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
public:
- packed_pixel& operator= (int chan) { check_gray(); at_c<0>(*this)=chan; return *this; }
- bool operator==(int chan) const { check_gray(); return at_c<0>(*this)==chan; }
+ packed_pixel& operator= (int chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
+ bool operator==(int chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
};
/////////////////////////////
Index: libs/gil/test/performance.cpp
===================================================================
--- libs/gil/test/performance.cpp (revision 54347)
+++ libs/gil/test/performance.cpp (working copy)
@@ -81,9 +81,9 @@
T* first=(T*)_v.row_begin(0);
T* last=first+_v.size()*3;
while(first!=last) {
- first[0]=at_c<0>(_p);
- first[1]=at_c<1>(_p);
- first[2]=at_c<2>(_p);
+ first[0]=boost::gil::at_c<0>(_p);
+ first[1]=boost::gil::at_c<1>(_p);
+ first[2]=boost::gil::at_c<2>(_p);
first+=3;
}
}
@@ -99,9 +99,9 @@
T1* first=(T1*)_v.row_begin(0);
T1* last=first+_v.size()*3;
while(first!=last) {
- first[0]=at_c<2>(_p);
- first[1]=at_c<1>(_p);
- first[2]=at_c<0>(_p);
+ first[0]=boost::gil::at_c<2>(_p);
+ first[1]=boost::gil::at_c<1>(_p);
+ first[2]=boost::gil::at_c<0>(_p);
first+=3;
}
}
@@ -116,12 +116,12 @@
void operator()() const {
std::size_t size=_v.size();
T1* first;
- first=(T1*)at_c<0>(_v.row_begin(0));
- std::fill(first,first+size,at_c<0>(_p));
- first=(T1*)at_c<1>(_v.row_begin(0));
- std::fill(first,first+size,at_c<1>(_p));
- first=(T1*)at_c<2>(_v.row_begin(0));
- std::fill(first,first+size,at_c<2>(_p));
+ first=(T1*)boost::gil::at_c<0>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<0>(_p));
+ first=(T1*)boost::gil::at_c<1>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<1>(_p));
+ first=(T1*)boost::gil::at_c<2>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<2>(_p));
}
};
@@ -135,12 +135,12 @@
void operator()() const {
std::size_t size=_v.size();
T1* first;
- first=(T1*)at_c<0>(_v.row_begin(0));
- std::fill(first,first+size,at_c<2>(_p));
- first=(T1*)at_c<1>(_v.row_begin(0));
- std::fill(first,first+size,at_c<1>(_p));
- first=(T1*)at_c<2>(_v.row_begin(0));
- std::fill(first,first+size,at_c<1>(_p));
+ first=(T1*)boost::gil::at_c<0>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<2>(_p));
+ first=(T1*)boost::gil::at_c<1>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<1>(_p));
+ first=(T1*)boost::gil::at_c<2>(_v.row_begin(0));
+ std::fill(first,first+size,boost::gil::at_c<1>(_p));
}
};
@@ -191,9 +191,9 @@
for_each_nongil_t(const View& v_in,const F& f_in) : _v(v_in), _f(f_in) {}
void operator()() const {
T1 *first0, *first1, *first2, *last0;
- first0=(T1*)at_c<0>(_v.row_begin(0));
- first1=(T1*)at_c<1>(_v.row_begin(0));
- first2=(T1*)at_c<2>(_v.row_begin(0));
+ first0=(T1*)boost::gil::at_c<0>(_v.row_begin(0));
+ first1=(T1*)boost::gil::at_c<1>(_v.row_begin(0));
+ first2=(T1*)boost::gil::at_c<2>(_v.row_begin(0));
last0=first0+_v.size();
while(first0!=last0) {
*first0++=0;
@@ -261,12 +261,12 @@
copy_nongil_t(const View1& v1_in,const View2& v2_in) : _v1(v1_in), _v2(v2_in) {}
void operator()() const {
std::size_t size=_v1.size();
- T1* first10=(T1*)at_c<0>(_v1.row_begin(0));
- T1* first11=(T1*)at_c<1>(_v1.row_begin(0));
- T1* first12=(T1*)at_c<2>(_v1.row_begin(0));
- T2* first20=(T2*)at_c<0>(_v2.row_begin(0));
- T2* first21=(T2*)at_c<1>(_v2.row_begin(0));
- T2* first22=(T2*)at_c<2>(_v2.row_begin(0));
+ T1* first10=(T1*)boost::gil::at_c<0>(_v1.row_begin(0));
+ T1* first11=(T1*)boost::gil::at_c<1>(_v1.row_begin(0));
+ T1* first12=(T1*)boost::gil::at_c<2>(_v1.row_begin(0));
+ T2* first20=(T2*)boost::gil::at_c<0>(_v2.row_begin(0));
+ T2* first21=(T2*)boost::gil::at_c<1>(_v2.row_begin(0));
+ T2* first22=(T2*)boost::gil::at_c<2>(_v2.row_begin(0));
std::copy(first10,first10+size,first20);
std::copy(first11,first11+size,first21);
std::copy(first12,first12+size,first22);
@@ -282,9 +282,9 @@
void operator()() const {
T1* first=(T1*)_v1.row_begin(0);
T1* last=first+_v1.size()*3;
- T2* first0=(T2*)at_c<0>(_v2.row_begin(0));
- T2* first1=(T2*)at_c<1>(_v2.row_begin(0));
- T2* first2=(T2*)at_c<2>(_v2.row_begin(0));
+ T2* first0=(T2*)boost::gil::at_c<0>(_v2.row_begin(0));
+ T2* first1=(T2*)boost::gil::at_c<1>(_v2.row_begin(0));
+ T2* first2=(T2*)boost::gil::at_c<2>(_v2.row_begin(0));
while(first!=last) {
*first0++=first[0];
*first1++=first[1];
@@ -303,9 +303,9 @@
void operator()() const {
T1* first=(T1*)_v2.row_begin(0);
T1* last=first+_v2.size()*3;
- T2* first0=(T2*)at_c<0>(_v1.row_begin(0));
- T2* first1=(T2*)at_c<1>(_v1.row_begin(0));
- T2* first2=(T2*)at_c<2>(_v1.row_begin(0));
+ T2* first0=(T2*)boost::gil::at_c<0>(_v1.row_begin(0));
+ T2* first1=(T2*)boost::gil::at_c<1>(_v1.row_begin(0));
+ T2* first2=(T2*)boost::gil::at_c<2>(_v1.row_begin(0));
while(first!=last) {
first[0]=*first0++;
first[1]=*first1++;
@@ -369,12 +369,12 @@
F _f;
transform_nongil_t(const View1& v1_in,const View2& v2_in,const F& f_in) : _v1(v1_in),_v2(v2_in),_f(f_in) {}
void operator()() const {
- T1* first10=(T1*)at_c<0>(_v1.row_begin(0));
- T1* first11=(T1*)at_c<1>(_v1.row_begin(0));
- T1* first12=(T1*)at_c<2>(_v1.row_begin(0));
- T1* first20=(T2*)at_c<0>(_v2.row_begin(0));
- T1* first21=(T2*)at_c<1>(_v2.row_begin(0));
- T1* first22=(T2*)at_c<2>(_v2.row_begin(0));
+ T1* first10=(T1*)boost::gil::at_c<0>(_v1.row_begin(0));
+ T1* first11=(T1*)boost::gil::at_c<1>(_v1.row_begin(0));
+ T1* first12=(T1*)boost::gil::at_c<2>(_v1.row_begin(0));
+ T1* first20=(T2*)boost::gil::at_c<0>(_v2.row_begin(0));
+ T1* first21=(T2*)boost::gil::at_c<1>(_v2.row_begin(0));
+ T1* first22=(T2*)boost::gil::at_c<2>(_v2.row_begin(0));
T1* last10=first10+_v1.size();
while(first10!=last10) {
*first20++=T2(*first12++*0.1f);
@@ -394,9 +394,9 @@
void operator()() const {
T1* first1=(T1*)_v1.row_begin(0);
T1* last1=first1+_v1.size()*3;
- T1* first20=(T2*)at_c<0>(_v2.row_begin(0));
- T1* first21=(T2*)at_c<1>(_v2.row_begin(0));
- T1* first22=(T2*)at_c<2>(_v2.row_begin(0));
+ T1* first20=(T2*)boost::gil::at_c<0>(_v2.row_begin(0));
+ T1* first21=(T2*)boost::gil::at_c<1>(_v2.row_begin(0));
+ T1* first22=(T2*)boost::gil::at_c<2>(_v2.row_begin(0));
while(first1!=last1) {
*first20++=T2(first1[2]*0.1f);
*first21++=T2(first1[1]*0.2f);
@@ -414,9 +414,9 @@
F _f;
transform_nongil_t(const View1& v1_in,const View2& v2_in,const F& f_in) : _v1(v1_in),_v2(v2_in),_f(f_in) {}
void operator()() const {
- T1* first10=(T1*)at_c<0>(_v1.row_begin(0));
- T1* first11=(T1*)at_c<1>(_v1.row_begin(0));
- T1* first12=(T1*)at_c<2>(_v1.row_begin(0));
+ T1* first10=(T1*)boost::gil::at_c<0>(_v1.row_begin(0));
+ T1* first11=(T1*)boost::gil::at_c<1>(_v1.row_begin(0));
+ T1* first12=(T1*)boost::gil::at_c<2>(_v1.row_begin(0));
T2* first2=(T1*)_v2.row_begin(0);
T1* last2=first2+_v1.size()*3;
while(first2!=last2) {
Index: libs/gil/test/pixel.cpp
===================================================================
--- libs/gil/test/pixel.cpp (revision 54347)
+++ libs/gil/test/pixel.cpp (working copy)
@@ -63,8 +63,8 @@
// test homogeneous algorithms - fill, max, min
static const int num_chan = num_channels<typename C2::pixel_t>::value;
- static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1);
- error_if(at_c<0>(C2::_pixel) != at_c<num_chan-1>(C2::_pixel));
+ static_fill(C2::_pixel, boost::gil::at_c<0>(C1::_pixel)+1);
+ error_if(boost::gil::at_c<0>(C2::_pixel) != boost::gil::at_c<num_chan-1>(C2::_pixel));
C2::_pixel = C1::_pixel;
error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
@@ -107,7 +107,7 @@
error_if(C1::_pixel!=C2::_pixel);
static_generate(C2::_pixel, set_to_one());
- error_if(at_c<0>(C2::_pixel) != 1);
+ error_if(boost::gil::at_c<0>(C2::_pixel) != 1);
// Test swap if both are mutable and if their value type is the same
// (We know the second one is mutable)
@@ -313,7 +313,7 @@
bgr8_pixel_t bgr8(rgb8);
error_if(bgr8[0] == rgb8[0]);
error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0));
- error_if(at_c<0>(bgr8) == at_c<0>(rgb8));
+ error_if(boost::gil::at_c<0>(bgr8) == boost::gil::at_c<0>(rgb8));
error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8));
error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t()));
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk