Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

From: bdawes_at_[hidden]
Date: 2008-07-08 14:56:11

Author: bemandawes
Date: 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
New Revision: 47246
URL: http://svn.boost.org/trac/boost/changeset/47246

Log:
Merge gil changes from trunk per Lubomir Bourdev
Added:
   branches/release/libs/gil/doc/insert_boost_licence.sh
      - copied unchanged from r47245, /trunk/libs/gil/doc/insert_boost_licence.sh
   branches/release/libs/gil/doc/shorten_file_name.sh
      - copied unchanged from r47245, /trunk/libs/gil/doc/shorten_file_name.sh
Text files modified:
   branches/release/boost/gil/algorithm.hpp | 4 +++-
   branches/release/boost/gil/bit_aligned_pixel_reference.hpp | 10 +++++-----
   branches/release/boost/gil/channel.hpp | 16 ++++++++--------
   branches/release/boost/gil/color_base.hpp | 10 +++++-----
   branches/release/boost/gil/device_n.hpp | 14 +++++++++-----
   branches/release/boost/gil/extension/io/png_io_private.hpp | 4 ++--
   branches/release/boost/gil/gil_concept.hpp | 4 ++--
   branches/release/boost/gil/planar_pixel_reference.hpp | 8 ++++----
   branches/release/libs/gil/doc/index.html | 2 +-
   branches/release/libs/gil/example/interleaved_ref.hpp | 4 ++--
   branches/release/libs/gil/test/Makefile | 34 +++++++++++++++++++++++++---------
   branches/release/libs/gil/test/image.cpp | 1 +
   branches/release/libs/gil/test/main.cpp | 26 +++++++++++++++++++++++++-
   branches/release/libs/gil/test/pixel.cpp | 2 +-
   14 files changed, 93 insertions(+), 46 deletions(-)

Modified: branches/release/boost/gil/algorithm.hpp
==============================================================================
--- branches/release/boost/gil/algorithm.hpp (original)
+++ branches/release/boost/gil/algorithm.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -16,9 +16,11 @@
 
 #include <cassert>
 #include <cstddef>
+#include <cstring>
 #include <algorithm>
 #include <iterator>
 #include <memory>
+#include <typeinfo>
 #include "gil_config.hpp"
 #include "gil_concept.hpp"
 #include "color_base_algorithm.hpp"
@@ -31,7 +33,7 @@
 /// \brief Some basic STL-style algorithms when applied to image views
 /// \author Lubomir Bourdev and Hailin Jin \n
 /// Adobe Systems Incorporated
-/// \date 2005-2007 \n Last updated on May 6, 2007
+/// \date 2005-2008 \n Last updated on March 12, 2008
 ///
 ////////////////////////////////////////////////////////////////////////////////////////
 

Modified: branches/release/boost/gil/bit_aligned_pixel_reference.hpp
==============================================================================
--- branches/release/boost/gil/bit_aligned_pixel_reference.hpp (original)
+++ branches/release/boost/gil/bit_aligned_pixel_reference.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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.
 */
 
 /*************************************************************************************************/
@@ -121,7 +121,7 @@
           bool IsMutable>
 struct bit_aligned_pixel_reference {
     BOOST_STATIC_CONSTANT(int, bit_size = (mpl::accumulate<ChannelBitSizes, mpl::int_<0>, mpl::plus<mpl::_1, mpl::_2> >::type::value));
- typedef bit_range<bit_size,IsMutable> bit_range_t;
+ typedef boost::gil::bit_range<bit_size,IsMutable> bit_range_t;
     typedef BitField bitfield_t;
     typedef typename mpl::if_c<IsMutable,unsigned char*,const unsigned char*>::type data_ptr_t;
 
@@ -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: branches/release/boost/gil/channel.hpp
==============================================================================
--- branches/release/boost/gil/channel.hpp (original)
+++ branches/release/boost/gil/channel.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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: branches/release/boost/gil/color_base.hpp
==============================================================================
--- branches/release/boost/gil/color_base.hpp (original)
+++ branches/release/boost/gil/color_base.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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.
 */
 
 /*************************************************************************************************/
@@ -129,7 +129,7 @@
           _v1(*memunit_advanced(semantic_at_c<1>(ptr),diff)) {}
 
     // Support for planar_pixel_reference operator[]
- Element at_c_dynamic(size_t i) const {
+ Element at_c_dynamic(std::size_t i) const {
         if (i==0) return _v0;
         return _v1;
     }
@@ -182,7 +182,7 @@
           _v2(*memunit_advanced(semantic_at_c<2>(ptr),diff)) {}
 
     // Support for planar_pixel_reference operator[]
- Element at_c_dynamic(size_t i) const {
+ Element at_c_dynamic(std::size_t i) const {
         switch (i) {
             case 0: return _v0;
             case 1: return _v1;
@@ -245,7 +245,7 @@
           _v3(*memunit_advanced(semantic_at_c<3>(ptr),diff)) {}
 
     // Support for planar_pixel_reference operator[]
- Element at_c_dynamic(size_t i) const {
+ Element at_c_dynamic(std::size_t i) const {
         switch (i) {
             case 0: return _v0;
             case 1: return _v1;
@@ -316,7 +316,7 @@
           _v4(*memunit_advanced(semantic_at_c<4>(ptr),diff)) {}
 
     // Support for planar_pixel_reference operator[]
- Element at_c_dynamic(size_t i) const {
+ Element at_c_dynamic(std::size_t i) const {
         switch (i) {
             case 0: return _v0;
             case 1: return _v1;

Modified: branches/release/boost/gil/device_n.hpp
==============================================================================
--- branches/release/boost/gil/device_n.hpp (original)
+++ branches/release/boost/gil/device_n.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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.
 */
 /*************************************************************************************************/
 
@@ -64,7 +64,8 @@
 template <typename IC>
 inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<2> > >::view_t
 planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, std::ptrdiff_t rowsize_in_bytes) {
- return typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<2> > >::view_t(width, height, planar_pixel_iterator<IC,devicen_t<2> >(c0,c1), rowsize_in_bytes);
+ typedef typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<2> > >::view_t view_t;
+ return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1), rowsize_in_bytes));
 }
 
 /// \ingroup ImageViewConstructors
@@ -72,7 +73,8 @@
 template <typename IC>
 inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3> > >::view_t
 planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, std::ptrdiff_t rowsize_in_bytes) {
- return typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3> > >::view_t(width, height, planar_pixel_iterator<IC,devicen_t<3> >(c0,c1,c2), rowsize_in_bytes);
+ typedef typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<3> > >::view_t view_t;
+ return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2), rowsize_in_bytes));
 }
 
 /// \ingroup ImageViewConstructors
@@ -80,7 +82,8 @@
 template <typename IC>
 inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4> > >::view_t
 planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, std::ptrdiff_t rowsize_in_bytes) {
- return typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4> > >::view_t(width, height, planar_pixel_iterator<IC,devicen_t<4> >(c0,c1,c2,c3), rowsize_in_bytes);
+ typedef typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<4> > >::view_t view_t;
+ return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2,c3), rowsize_in_bytes));
 }
 
 /// \ingroup ImageViewConstructors
@@ -88,7 +91,8 @@
 template <typename IC>
 inline typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5> > >::view_t
 planar_devicen_view(std::size_t width, std::size_t height, IC c0, IC c1, IC c2, IC c3, IC c4, std::ptrdiff_t rowsize_in_bytes) {
- return typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5> > >::view_t(width, height, planar_pixel_iterator<IC,devicen_t<5> >(c0,c1,c2,c3,c4), rowsize_in_bytes);
+ typedef typename type_from_x_iterator<planar_pixel_iterator<IC,devicen_t<5> > >::view_t view_t;
+ return view_t(width, height, typename view_t::locator(typename view_t::x_iterator(c0,c1,c2,c3,c4), rowsize_in_bytes));
 }
 
 } } // namespace boost::gil

Modified: branches/release/boost/gil/extension/io/png_io_private.hpp
==============================================================================
--- branches/release/boost/gil/extension/io/png_io_private.hpp (original)
+++ branches/release/boost/gil/extension/io/png_io_private.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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.
 */
 /*************************************************************************************************/
 
@@ -28,7 +28,7 @@
 
 namespace detail {
 
-static const size_t PNG_BYTES_TO_CHECK = 4;
+static const std::size_t PNG_BYTES_TO_CHECK = 4;
 
 // lbourdev: These can be greatly simplified, for example:
 template <typename Cs> struct png_color_type {BOOST_STATIC_CONSTANT(int,color_type=0);};

Modified: branches/release/boost/gil/gil_concept.hpp
==============================================================================
--- branches/release/boost/gil/gil_concept.hpp (original)
+++ branches/release/boost/gil/gil_concept.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -702,8 +702,8 @@
         typedef typename kth_element_type<ColorBase,num_elements-1>::type TN;
 
         BOOST_STATIC_ASSERT((is_same<T0,TN>::value)); // better than nothing
- typedef typename kth_element_const_reference_type<ColorBase,0>::type CR0;
- CR0 e0=dynamic_at_c(cb,0);
+ typedef typename kth_element_const_reference_type<ColorBase,0>::type CRef0;
+ CRef0 e0=dynamic_at_c(cb,0);
     }
     ColorBase cb;
 };

Modified: branches/release/boost/gil/planar_pixel_reference.hpp
==============================================================================
--- branches/release/boost/gil/planar_pixel_reference.hpp (original)
+++ branches/release/boost/gil/planar_pixel_reference.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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: branches/release/libs/gil/doc/index.html
==============================================================================
--- branches/release/libs/gil/doc/index.html (original)
+++ branches/release/libs/gil/doc/index.html 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -21,7 +21,7 @@
         <h3 class="navbar">Information</h3>
         <ul>
             <li>GIL ASL Home</li>
- <li>GIL Wxtensions</li>
+ <li>GIL Extensions</li>
             <li>GIL Discussion Forum</li>
             <li>Acknowledgements</li>
         </ul>

Modified: branches/release/libs/gil/example/interleaved_ref.hpp
==============================================================================
--- branches/release/libs/gil/example/interleaved_ref.hpp (original)
+++ branches/release/libs/gil/example/interleaved_ref.hpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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: branches/release/libs/gil/test/Makefile
==============================================================================
--- branches/release/libs/gil/test/Makefile (original)
+++ branches/release/libs/gil/test/Makefile 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -7,8 +7,9 @@
 .SUFFIXES: .cpp
 #CXX=/usr/local/gcc4/bin/g++
 #CXX=/usr/local/gcc411/bin/g++
-#CXX=/usr/local/gcc412/bin/g++
-CXX=g++
+CXX=/usr/local/gcc430/bin/g++
+#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
@@ -21,17 +22,32 @@
 LIBPNG_INCLUDE_PATH=-I../../../../lib/libpng
 LIBPNG_LIB_PATH=-L../../../../lib/libpng
 LIBZ_LIB_PATH=-L../../../../lib/zlib
-ALL_OBJECTS=main.o channel.o pixel.o pixel_iterator.o image.o image_io.o sample_image.o
 
-all: performance checksum
+all: performance channel_test pixel_test pixel_iterator_test image_checksum_test image_io_checksum_test
 .cpp.o:
 # ${CXX} ${CXX_FLAGS} ${BOOST_INCLUDE_PATH} ${LIBJPEG_INCLUDE_PATH} ${LIBTIFF_INCLUDE_PATH} ${LIBPNG_INCLUDE_PATH} -c $<
         ${CXX} ${CXX_CHECKSUM_FLAGS} ${BOOST_INCLUDE_PATH} -c $<
 clean:
         -rm -f *.o *.exe
-performance: performance.o
+performance: performance.o
         ${CXX} -o performance ${CXX_FLAGS} performance.o
-test: ${ALL_OBJECTS}
- ${CXX} -o test ${CXX_FLAGS} ${ALL_OBJECTS} ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
-checksum: ${ALL_OBJECTS}
- ${CXX} -o test ${CXX_CHECKSUM_FLAGS} ${ALL_OBJECTS}
+channel_test: channel.o error_if.o
+ ${CXX} -o channel_test ${CXX_CHECKSUM_FLAGS} channel.o error_if.o
+pixel_test: pixel.o error_if.o
+ ${CXX} -o pixel_test ${CXX_CHECKSUM_FLAGS} pixel.o error_if.o
+pixel_iterator_test: pixel_iterator.o error_if.o
+ ${CXX} -o pixel_iterator_test ${CXX_CHECKSUM_FLAGS} pixel_iterator.o error_if.o
+image_checksum_test: image.o error_if.o sample_image.o
+ ${CXX} -o image_checksum_test ${CXX_CHECKSUM_FLAGS} image.o error_if.o sample_image.o
+image_test: image.o error_if.o sample_image.o
+ ${CXX} -o image_test ${CXX_FLAGS} image.o error_if.o sample_image.o ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
+image_io_checksum_test: image_io.o error_if.o
+ ${CXX} -o image_io_checksum_test ${CXX_CHECKSUM_FLAGS} image_io.o error_if.o
+image_io_test: image_io.o error_if.o
+ ${CXX} -o image_io_test ${CXX_FLAGS} image_io.o error_if.o ${LIBJPEG_LIB_PATH} -ljpeg ${LIBTIFF_LIB_PATH} -ltiff ${LIBPNG_LIB_PATH} -lpng ${LIBZ_LIB_PATH} -lz
+run_all: channel_test pixel_test pixel_iterator_test image_checksum_test image_io_checksum_test
+ channel_test
+ pixel_test
+ pixel_iterator_test
+ image_checksum_test
+ image_io_checksum_test

Modified: branches/release/libs/gil/test/image.cpp
==============================================================================
--- branches/release/libs/gil/test/image.cpp (original)
+++ branches/release/libs/gil/test/image.cpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <vector>
+#include <ios>
 #include <iostream>
 #include <fstream>
 #include <map>

Modified: branches/release/libs/gil/test/main.cpp
==============================================================================
--- branches/release/libs/gil/test/main.cpp (original)
+++ branches/release/libs/gil/test/main.cpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -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();

Modified: branches/release/libs/gil/test/pixel.cpp
==============================================================================
--- branches/release/libs/gil/test/pixel.cpp (original)
+++ branches/release/libs/gil/test/pixel.cpp 2008-07-08 14:56:09 EDT (Tue, 08 Jul 2008)
@@ -146,7 +146,7 @@
 };
 
 template <typename PixelRef, int Tag=0>
-class reference_core : value_core<typename boost::remove_reference<PixelRef>::type::value_type, Tag> {
+class reference_core : public value_core<typename boost::remove_reference<PixelRef>::type::value_type, Tag> {
 public:
     typedef PixelRef type;
     typedef typename boost::remove_reference<PixelRef>::type pixel_t;

Date view Thread view Subject view Author view

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