Subject: [Boost-commit] svn:boost r64097 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2010-07-17 10:04:52
Author: psiha
Date: 2010-07-17 10:04:51 EDT (Sat, 17 Jul 2010)
New Revision: 64097
URL: http://svn.boost.org/trac/boost/changeset/64097
Log:
Fixed compilation errors.
Text files modified:
sandbox/gil/boost/gil/extension/io2/formatted_image.hpp | 1 +
sandbox/gil/boost/gil/extension/io2/libtiff_private_base.hpp | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
Modified: sandbox/gil/boost/gil/extension/io2/formatted_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/formatted_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/formatted_image.hpp 2010-07-17 10:04:51 EDT (Sat, 17 Jul 2010)
@@ -31,6 +31,7 @@
#include <boost/detail/endian.hpp>
#endif // _DEBUG
#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/for_each.hpp>
#include <boost/mpl/integral_c.hpp>
#ifdef _DEBUG
#include <boost/numeric/conversion/converter.hpp>
Modified: sandbox/gil/boost/gil/extension/io2/libtiff_private_base.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libtiff_private_base.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libtiff_private_base.hpp 2010-07-17 10:04:51 EDT (Sat, 17 Jul 2010)
@@ -26,6 +26,7 @@
...error...libtiff support requires mpl vectors of size 35...
#endif
+#include <boost/array.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/smart_ptr/scoped_array.hpp>
@@ -234,7 +235,7 @@
}
generic_vertical_roi::offset_t offset_;
- point_t const & dimensions_;
+ point2<std::ptrdiff_t> const & dimensions_;
unsigned int stride_;
unsigned int number_of_planes_;
array<unsigned char *, 4> plane_buffers_;
@@ -425,7 +426,7 @@
friend base_t;
struct tile_setup_t : noncopyable
{
- tile_setup_t( libtiff_image const & source, point_t const & dimensions, offset_t const offset, bool const nptcc )
+ tile_setup_t( libtiff_image const & source, point2<std::ptrdiff_t> const & dimensions, offset_t const offset, bool const nptcc )
:
tile_height ( source.get_field<uint32>( TIFFTAG_TILELENGTH ) ),
tile_width ( source.get_field<uint32>( TIFFTAG_TILEWIDTH ) ),
@@ -631,7 +632,7 @@
unsigned int const number_of_planes( is_planar<MyView>::value ? num_channels<MyView>::value : 1 );
- point_t const & dimensions( original_view( view ).dimensions() );
+ point2<std::ptrdiff_t> const & dimensions( original_view( view ).dimensions() );
////////////////////////////////////////////////////////////////////////
// Tiled