|
|
Boost-Commit : |
From: lbourdev_at_[hidden]
Date: 2007-12-14 00:32:23
Author: lbourdev
Date: 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
New Revision: 42023
URL: http://svn.boost.org/trac/boost/changeset/42023
Log:
GIL: Fixed Intel compiler errors.
Text files modified:
trunk/boost/gil/bit_aligned_pixel_reference.hpp | 8 ++++----
trunk/boost/gil/channel.hpp | 16 ++++++++--------
trunk/boost/gil/planar_pixel_reference.hpp | 8 ++++----
trunk/libs/gil/example/interleaved_ref.hpp | 4 ++--
trunk/libs/gil/test/Makefile | 4 ++--
trunk/libs/gil/test/main.cpp | 26 +++++++++++++++++++++++++-
6 files changed, 45 insertions(+), 21 deletions(-)
Modified: trunk/boost/gil/bit_aligned_pixel_reference.hpp
==============================================================================
--- trunk/boost/gil/bit_aligned_pixel_reference.hpp (original)
+++ trunk/boost/gil/bit_aligned_pixel_reference.hpp 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -5,7 +5,7 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
- See http://opensource.adobe.com/gil for most recent version including documentation.
+ See http://stlab.adobe.com/gil for most recent version including documentation.
*/
/*************************************************************************************************/
@@ -283,19 +283,19 @@
// Having three overloads allows us to swap between different (but compatible) models of PixelConcept
template <typename B, typename C, typename L, typename R> inline
-void swap(boost::gil::bit_aligned_pixel_reference<B,C,L,true> x, R& y) {
+void swap(const boost::gil::bit_aligned_pixel_reference<B,C,L,true> x, R& y) {
boost::gil::swap_proxy<typename boost::gil::bit_aligned_pixel_reference<B,C,L,true>::value_type>(x,y);
}
template <typename B, typename C, typename L> inline
-void swap(typename boost::gil::bit_aligned_pixel_reference<B,C,L,true>::value_type& x, boost::gil::bit_aligned_pixel_reference<B,C,L,true> y) {
+void swap(typename boost::gil::bit_aligned_pixel_reference<B,C,L,true>::value_type& x, const boost::gil::bit_aligned_pixel_reference<B,C,L,true> y) {
boost::gil::swap_proxy<typename boost::gil::bit_aligned_pixel_reference<B,C,L,true>::value_type>(x,y);
}
template <typename B, typename C, typename L> inline
-void swap(boost::gil::bit_aligned_pixel_reference<B,C,L,true> x, boost::gil::bit_aligned_pixel_reference<B,C,L,true> y) {
+void swap(const boost::gil::bit_aligned_pixel_reference<B,C,L,true> x, const boost::gil::bit_aligned_pixel_reference<B,C,L,true> y) {
boost::gil::swap_proxy<typename boost::gil::bit_aligned_pixel_reference<B,C,L,true>::value_type>(x,y);
}
} // namespace std
Modified: trunk/boost/gil/channel.hpp
==============================================================================
--- trunk/boost/gil/channel.hpp (original)
+++ trunk/boost/gil/channel.hpp 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -5,7 +5,7 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
- See http://opensource.adobe.com/gil for most recent version including documentation.
+ See http://stlab.adobe.com/gil for most recent version including documentation.
*/
/*************************************************************************************************/
@@ -264,7 +264,7 @@
template <>
struct static_copy_bytes<0> {
- void operator()(const unsigned char* from, unsigned char* to) const {}
+ void operator()(const unsigned char* , unsigned char*) const {}
};
template <typename Derived, typename BitField, int NumBits, bool Mutable>
@@ -425,7 +425,7 @@
/// \ingroup PackedChannelReferenceModel
/// \brief swap for packed_channel_reference
template <typename BF, int FB, int NB, bool M, typename R> inline
-void swap(boost::gil::packed_channel_reference<BF,FB,NB,M> x, R& y) {
+void swap(const boost::gil::packed_channel_reference<BF,FB,NB,M> x, R& y) {
boost::gil::swap_proxy<typename boost::gil::packed_channel_reference<BF,FB,NB,M>::value_type>(x,y);
}
@@ -433,7 +433,7 @@
/// \ingroup PackedChannelReferenceModel
/// \brief swap for packed_channel_reference
template <typename BF, int FB, int NB, bool M> inline
-void swap(typename boost::gil::packed_channel_reference<BF,FB,NB,M>::value_type& x, boost::gil::packed_channel_reference<BF,FB,NB,M> y) {
+void swap(typename boost::gil::packed_channel_reference<BF,FB,NB,M>::value_type& x, const boost::gil::packed_channel_reference<BF,FB,NB,M> y) {
boost::gil::swap_proxy<typename boost::gil::packed_channel_reference<BF,FB,NB,M>::value_type>(x,y);
}
@@ -441,7 +441,7 @@
/// \ingroup PackedChannelReferenceModel
/// \brief swap for packed_channel_reference
template <typename BF, int FB, int NB, bool M> inline
-void swap(boost::gil::packed_channel_reference<BF,FB,NB,M> x, boost::gil::packed_channel_reference<BF,FB,NB,M> y) {
+void swap(const boost::gil::packed_channel_reference<BF,FB,NB,M> x, const boost::gil::packed_channel_reference<BF,FB,NB,M> y) {
boost::gil::swap_proxy<typename boost::gil::packed_channel_reference<BF,FB,NB,M>::value_type>(x,y);
}
} // namespace std
@@ -545,7 +545,7 @@
/// \ingroup PackedChannelDynamicReferenceModel
/// \brief swap for packed_dynamic_channel_reference
template <typename BF, int NB, bool M, typename R> inline
-void swap(boost::gil::packed_dynamic_channel_reference<BF,NB,M> x, R& y) {
+void swap(const boost::gil::packed_dynamic_channel_reference<BF,NB,M> x, R& y) {
boost::gil::swap_proxy<typename boost::gil::packed_dynamic_channel_reference<BF,NB,M>::value_type>(x,y);
}
@@ -553,7 +553,7 @@
/// \ingroup PackedChannelDynamicReferenceModel
/// \brief swap for packed_dynamic_channel_reference
template <typename BF, int NB, bool M> inline
-void swap(typename boost::gil::packed_dynamic_channel_reference<BF,NB,M>::value_type& x, boost::gil::packed_dynamic_channel_reference<BF,NB,M> y) {
+void swap(typename boost::gil::packed_dynamic_channel_reference<BF,NB,M>::value_type& x, const boost::gil::packed_dynamic_channel_reference<BF,NB,M> y) {
boost::gil::swap_proxy<typename boost::gil::packed_dynamic_channel_reference<BF,NB,M>::value_type>(x,y);
}
@@ -561,7 +561,7 @@
/// \ingroup PackedChannelDynamicReferenceModel
/// \brief swap for packed_dynamic_channel_reference
template <typename BF, int NB, bool M> inline
-void swap(boost::gil::packed_dynamic_channel_reference<BF,NB,M> x, boost::gil::packed_dynamic_channel_reference<BF,NB,M> y) {
+void swap(const boost::gil::packed_dynamic_channel_reference<BF,NB,M> x, const boost::gil::packed_dynamic_channel_reference<BF,NB,M> y) {
boost::gil::swap_proxy<typename boost::gil::packed_dynamic_channel_reference<BF,NB,M>::value_type>(x,y);
}
} // namespace std
Modified: trunk/boost/gil/planar_pixel_reference.hpp
==============================================================================
--- trunk/boost/gil/planar_pixel_reference.hpp (original)
+++ trunk/boost/gil/planar_pixel_reference.hpp 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -5,7 +5,7 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
- See http://opensource.adobe.com/gil for most recent version including documentation.
+ See http://stlab.adobe.com/gil for most recent version including documentation.
*/
/*************************************************************************************************/
@@ -162,7 +162,7 @@
/// \brief swap for planar_pixel_reference
/// \ingroup PixelModelPlanarRef
template <typename CR, typename CS, typename R> inline
-void swap(boost::gil::planar_pixel_reference<CR,CS> x, R& y) {
+void swap(const boost::gil::planar_pixel_reference<CR,CS> x, R& y) {
boost::gil::swap_proxy<typename boost::gil::planar_pixel_reference<CR,CS>::value_type>(x,y);
}
@@ -170,7 +170,7 @@
/// \brief swap for planar_pixel_reference
/// \ingroup PixelModelPlanarRef
template <typename CR, typename CS> inline
-void swap(typename boost::gil::planar_pixel_reference<CR,CS>::value_type& x, boost::gil::planar_pixel_reference<CR,CS> y) {
+void swap(typename boost::gil::planar_pixel_reference<CR,CS>::value_type& x, const boost::gil::planar_pixel_reference<CR,CS> y) {
boost::gil::swap_proxy<typename boost::gil::planar_pixel_reference<CR,CS>::value_type>(x,y);
}
@@ -178,7 +178,7 @@
/// \brief swap for planar_pixel_reference
/// \ingroup PixelModelPlanarRef
template <typename CR, typename CS> inline
-void swap(boost::gil::planar_pixel_reference<CR,CS> x, boost::gil::planar_pixel_reference<CR,CS> y) {
+void swap(const boost::gil::planar_pixel_reference<CR,CS> x, const boost::gil::planar_pixel_reference<CR,CS> y) {
boost::gil::swap_proxy<typename boost::gil::planar_pixel_reference<CR,CS>::value_type>(x,y);
}
} // namespace std
Modified: trunk/libs/gil/example/interleaved_ref.hpp
==============================================================================
--- trunk/libs/gil/example/interleaved_ref.hpp (original)
+++ trunk/libs/gil/example/interleaved_ref.hpp 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -5,7 +5,7 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
- See http://opensource.adobe.com/gil for most recent version including documentation.
+ See http://stlab.adobe.com/gil for most recent version including documentation.
*/
/*************************************************************************************************/
@@ -130,7 +130,7 @@
// Required by MutableColorBaseConcept. The default std::swap does not do the right thing for proxy references - it swaps the references, not the values
template <typename ChannelReference, typename Layout>
-void swap(interleaved_ref<ChannelReference,Layout>& x, interleaved_ref<ChannelReference,Layout>& y) {
+void swap(const interleaved_ref<ChannelReference,Layout>& x, const interleaved_ref<ChannelReference,Layout>& y) {
static_for_each(x,y,detail::swap_fn_t());
};
Modified: trunk/libs/gil/test/Makefile
==============================================================================
--- trunk/libs/gil/test/Makefile (original)
+++ trunk/libs/gil/test/Makefile 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -2,8 +2,8 @@
#CXX=/usr/local/gcc4/bin/g++
#CXX=/usr/local/gcc411/bin/g++
#CXX=/usr/local/gcc422/bin/g++
-#CXX=g++
-CXX='/cygdrive/c/Program Files/Intel/Compiler/C++/10.0.027/IA32/Bin/icl.exe'
+CXX=g++
+#CXX='/cygdrive/c/Program Files/Intel/Compiler/C++/10.0.027/IA32/Bin/icl.exe'
CXX_FLAGS=-Wall -DBOOST_GIL_USE_CONCEPT_CHECK #-DNDEBUG
CXX_CHECKSUM_FLAGS=-Wall -DBOOST_GIL_NO_IO -DBOOST_GIL_USE_CONCEPT_CHECK #-DNDEBUG
Modified: trunk/libs/gil/test/main.cpp
==============================================================================
--- trunk/libs/gil/test/main.cpp (original)
+++ trunk/libs/gil/test/main.cpp 2007-12-14 00:32:21 EST (Fri, 14 Dec 2007)
@@ -5,7 +5,7 @@
Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt).
- See http://opensource.adobe.com/gil for most recent version including documentation.
+ See http://stlab.adobe.com/gil for most recent version including documentation.
*/
// main.cpp : Runs all GIL tests.
//
@@ -13,6 +13,30 @@
#include <fstream>
#include <iostream>
+#define main main1
+#include "channel.cpp"
+#undef main
+
+#define main main2
+#define value_core pixel_value_core
+#define reference_core pixel_reference_core
+#include "pixel.cpp"
+#undef value_core
+#undef reference_core
+#undef main
+
+#define main main3
+#include "pixel_iterator.cpp"
+#undef main
+
+#define main main4
+#include "image.cpp"
+#undef main
+
+#define main main5
+#include "image_io.cpp"
+#undef main
+
void test_channel();
void test_pixel();
void test_pixel_iterator();
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk