Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e5f9e16a85 | ||
|
bcbc97f80d | ||
|
65538ccd6e | ||
|
3900deaf48 | ||
|
2bda224106 | ||
|
795ebcc5ea |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: boost
|
||||
# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $
|
||||
NAME := boost
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
16
boost-fs_gcc44.patch
Normal file
16
boost-fs_gcc44.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Index: boost/filesystem/operations.hpp
|
||||
===================================================================
|
||||
--- boost/filesystem/operations.hpp (revision 52859)
|
||||
+++ boost/filesystem/operations.hpp (working copy)
|
||||
@@ -659,9 +659,9 @@
|
||||
{ return is_symlink<wpath>( ph ); }
|
||||
|
||||
inline bool is_empty( const path & ph )
|
||||
- { return is_empty<path>( ph ); }
|
||||
+ { return boost::filesystem::is_empty<path>( ph ); }
|
||||
inline bool is_empty( const wpath & ph )
|
||||
- { return is_empty<wpath>( ph ); }
|
||||
+ { return boost::filesystem::is_empty<wpath>( ph ); }
|
||||
|
||||
inline bool equivalent( const path & ph1, const path & ph2 )
|
||||
{ return equivalent<path>( ph1, ph2 ); }
|
159
boost-gil_gcc44-2.patch
Normal file
159
boost-gil_gcc44-2.patch
Normal file
@ -0,0 +1,159 @@
|
||||
Index: /trunk/boost/gil/color_base.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/color_base.hpp (revision 54725)
|
||||
+++ /trunk/boost/gil/color_base.hpp (revision 58777)
|
||||
@@ -86,5 +86,5 @@
|
||||
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)) {}
|
||||
};
|
||||
|
||||
@@ -108,11 +108,11 @@
|
||||
|
||||
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
|
||||
@@ -213,15 +213,15 @@
|
||||
|
||||
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
|
||||
@@ -279,17 +279,17 @@
|
||||
|
||||
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
|
||||
Index: /trunk/boost/gil/bit_aligned_pixel_reference.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 54725)
|
||||
+++ /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 58777)
|
||||
@@ -170,6 +170,6 @@
|
||||
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: /trunk/boost/gil/extension/dynamic_image/reduce.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 37609)
|
||||
+++ /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 58777)
|
||||
@@ -60,5 +60,5 @@
|
||||
template <typename SrcTypes, typename DstTypes, long K>
|
||||
struct at_c<mapping_vector<SrcTypes,DstTypes>, K> {
|
||||
- static const std::size_t value=size<DstTypes>::value - order<DstTypes, typename at_c<SrcTypes,K>::type>::type::value +1;
|
||||
+ static const std::size_t value=size<DstTypes>::value - order<DstTypes, typename gil::at_c<SrcTypes,K>::type>::type::value +1;
|
||||
typedef size_t<value> type;
|
||||
};
|
||||
Index: /trunk/boost/gil/gil_concept.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/gil_concept.hpp (revision 57980)
|
||||
+++ /trunk/boost/gil/gil_concept.hpp (revision 58777)
|
||||
@@ -619,5 +619,5 @@
|
||||
|
||||
#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
|
||||
|
||||
@@ -656,6 +656,6 @@
|
||||
|
||||
#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: /trunk/boost/gil/planar_pixel_iterator.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/planar_pixel_iterator.hpp (revision 54725)
|
||||
+++ /trunk/boost/gil/planar_pixel_iterator.hpp (revision 58777)
|
||||
@@ -185,5 +185,5 @@
|
||||
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));
|
||||
}
|
||||
|
||||
Index: /trunk/boost/gil/packed_pixel.hpp
|
||||
===================================================================
|
||||
--- /trunk/boost/gil/packed_pixel.hpp (revision 58302)
|
||||
+++ /trunk/boost/gil/packed_pixel.hpp (revision 58777)
|
||||
@@ -78,5 +78,5 @@
|
||||
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) {
|
||||
@@ -107,9 +107,9 @@
|
||||
// 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; }
|
||||
};
|
||||
|
204
boost-gil_gcc44.patch
Normal file
204
boost-gil_gcc44.patch
Normal file
@ -0,0 +1,204 @@
|
||||
Index: boost/gil/bit_aligned_pixel_reference.hpp
|
||||
===================================================================
|
||||
--- boost/gil/bit_aligned_pixel_reference.hpp (revision 53049)
|
||||
+++ 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> >();
|
||||
}
|
||||
|
||||
Index: boost/gil/color_base.hpp
|
||||
===================================================================
|
||||
--- boost/gil/color_base.hpp (revision 53049)
|
||||
+++ boost/gil/color_base.hpp (working copy)
|
||||
@@ -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) :
|
||||
Index: boost/gil/color_base_algorithm.hpp
|
||||
===================================================================
|
||||
--- boost/gil/color_base_algorithm.hpp (revision 53049)
|
||||
+++ 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/image_view_factory.hpp
|
||||
===================================================================
|
||||
--- boost/gil/image_view_factory.hpp (revision 53049)
|
||||
+++ 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/packed_pixel.hpp
|
||||
===================================================================
|
||||
--- boost/gil/packed_pixel.hpp (revision 53049)
|
||||
+++ boost/gil/packed_pixel.hpp (working copy)
|
||||
@@ -81,7 +81,7 @@
|
||||
}
|
||||
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));
|
||||
Index: boost/gil/pixel.hpp
|
||||
===================================================================
|
||||
--- boost/gil/pixel.hpp (revision 53049)
|
||||
+++ 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/planar_pixel_iterator.hpp
|
||||
===================================================================
|
||||
--- boost/gil/planar_pixel_iterator.hpp (revision 53049)
|
||||
+++ 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 {
|
||||
Index: libs/gil/test/pixel.cpp
|
||||
===================================================================
|
||||
--- libs/gil/test/pixel.cpp (revision 53049)
|
||||
+++ libs/gil/test/pixel.cpp (working copy)
|
||||
@@ -34,8 +34,9 @@
|
||||
// Testing pixel references and values, pixel operations, color conversion
|
||||
|
||||
using namespace boost::gil;
|
||||
-using namespace std;
|
||||
+using std::swap;
|
||||
using namespace boost;
|
||||
+
|
||||
void error_if(bool condition);
|
||||
|
||||
struct increment {
|
||||
@@ -63,8 +64,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, gil::at_c<0>(C1::_pixel)+1);
|
||||
+ error_if(gil::at_c<0>(C2::_pixel) != gil::at_c<num_chan-1>(C2::_pixel));
|
||||
|
||||
C2::_pixel = C1::_pixel;
|
||||
error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
|
||||
@@ -107,7 +108,7 @@
|
||||
error_if(C1::_pixel!=C2::_pixel);
|
||||
|
||||
static_generate(C2::_pixel, set_to_one());
|
||||
- error_if(at_c<0>(C2::_pixel) != 1);
|
||||
+ error_if(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 +314,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(gil::at_c<0>(bgr8) == 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()));
|
||||
|
20
boost.spec
20
boost.spec
@ -4,7 +4,7 @@
|
||||
Name: boost
|
||||
Summary: The Boost C++ Libraries
|
||||
Version: 1.37.0
|
||||
Release: 6%{?dist}
|
||||
Release: 9%{?dist}
|
||||
License: Boost
|
||||
URL: http://www.boost.org/
|
||||
Group: System Environment/Libraries
|
||||
@ -30,6 +30,9 @@ Patch5: boost-function_template.patch
|
||||
Patch6: boost-unneccessary_iostreams.patch
|
||||
Patch7: boost-1_37_0-smp.patch
|
||||
Patch8: boost-bitset.patch
|
||||
Patch9: boost-fs_gcc44.patch
|
||||
Patch10: boost-gil_gcc44.patch
|
||||
Patch11: boost-gil_gcc44-2.patch
|
||||
|
||||
%description
|
||||
Boost provides free peer-reviewed portable C++ source libraries. The
|
||||
@ -78,6 +81,9 @@ sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0
|
||||
%patch6 -p0
|
||||
sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0
|
||||
%patch8 -p1
|
||||
%patch9 -p0
|
||||
%patch10 -p0
|
||||
%patch11 -p2
|
||||
|
||||
%build
|
||||
BOOST_ROOT=`pwd`
|
||||
@ -210,6 +216,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_docdir}/%{name}-%{version}
|
||||
|
||||
%changelog
|
||||
* Wed Jan 27 2010 Petr Machata <pmachata@redhat.com> - 1.37.0-9
|
||||
- More GCC 4.4 name resolution fixes for GIL
|
||||
- Resolves: #526834
|
||||
|
||||
* Wed Oct 14 2009 Petr Machata <pmachata@redhat.com> - 1.37.0-8
|
||||
- GCC 4.4 name resolution fixes for GIL
|
||||
- Resolves: #526834
|
||||
|
||||
* Fri Jul 3 2009 Petr Machata <pmachata@redhat.com> - 1.37.0-7
|
||||
- Add upstream patch to make boost_filesystem compatible with C++0x.
|
||||
- Resolves: #509250
|
||||
|
||||
* Mon Mar 23 2009 Petr Machata <pmachata@redhat.com> - 1.37.0-6
|
||||
- Apply a SMP patch from Stefan Ring
|
||||
- Apply a workaround for "cannot appear in a constant-expression" in
|
||||
|
@ -1 +0,0 @@
|
||||
boost-1_37_0-1_fc10:HEAD:boost-1.37.0-1.fc10.src.rpm:1229535558
|
Loading…
Reference in New Issue
Block a user