Subject: [Boost-commit] svn:boost r85549 - in trunk/boost/gil/extension/io: detail formats/bmp formats/targa formats/tiff
From: chhenning_at_[hidden]
Date: 2013-09-02 17:34:35
Author: chhenning
Date: 2013-09-02 17:34:34 EDT (Mon, 02 Sep 2013)
New Revision: 85549
URL: http://svn.boost.org/trac/boost/changeset/85549
Log:
Fixed compiler errors with gcc.
Text files modified:
trunk/boost/gil/extension/io/detail/scanline_read_iterator.hpp | 22 +++++++++++++++-------
trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp | 6 ------
trunk/boost/gil/extension/io/formats/targa/scanline_read.hpp | 6 ------
trunk/boost/gil/extension/io/formats/tiff/scanline_read.hpp | 5 -----
4 files changed, 15 insertions(+), 24 deletions(-)
Modified: trunk/boost/gil/extension/io/detail/scanline_read_iterator.hpp
==============================================================================
--- trunk/boost/gil/extension/io/detail/scanline_read_iterator.hpp Mon Sep 2 01:37:45 2013 (r85548)
+++ trunk/boost/gil/extension/io/detail/scanline_read_iterator.hpp 2013-09-02 17:34:34 EDT (Mon, 02 Sep 2013) (r85549)
@@ -27,9 +27,9 @@
namespace boost { namespace gil {
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
-#pragma warning(push)
-#pragma warning(disable:4512) //assignment operator could not be generated
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(push)
+#pragma warning(disable:4512) //assignment operator could not be generated
#endif
/// Input iterator to read images.
@@ -39,6 +39,14 @@
, std::input_iterator_tag
>
{
+private:
+
+ typedef boost::iterator_facade< scanline_read_iterator< Reader >
+ , byte_t*
+ , std::input_iterator_tag
+ > base_t;
+
+
public:
scanline_read_iterator( Reader& reader
@@ -76,7 +84,7 @@
return _pos == rhs._pos;
}
- reference dereference() const
+ typename base_t::reference dereference() const
{
if( _read_scanline == true )
{
@@ -106,9 +114,9 @@
mutable byte_t* _buffer_start;
};
-#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
-#pragma warning(pop)
-#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+#pragma warning(pop)
+#endif
} // namespace gil
} // namespace boost
Modified: trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp Mon Sep 2 01:37:45 2013 (r85548)
+++ trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp 2013-09-02 17:34:34 EDT (Mon, 02 Sep 2013) (r85549)
@@ -48,12 +48,6 @@
, bmp_tag
>
{
-private:
-
- typedef scanline_reader< Device
- , bmp_tag
- > this_t;
-
public:
typedef bmp_tag tag_t;
Modified: trunk/boost/gil/extension/io/formats/targa/scanline_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/targa/scanline_read.hpp Mon Sep 2 01:37:45 2013 (r85548)
+++ trunk/boost/gil/extension/io/formats/targa/scanline_read.hpp 2013-09-02 17:34:34 EDT (Mon, 02 Sep 2013) (r85549)
@@ -46,12 +46,6 @@
, targa_tag
>
{
-private:
-
- typedef scanline_reader< Device
- , targa_tag
- > this_t;
-
public:
Modified: trunk/boost/gil/extension/io/formats/tiff/scanline_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/tiff/scanline_read.hpp Mon Sep 2 01:37:45 2013 (r85548)
+++ trunk/boost/gil/extension/io/formats/tiff/scanline_read.hpp 2013-09-02 17:34:34 EDT (Mon, 02 Sep 2013) (r85549)
@@ -64,11 +64,6 @@
, tiff_tag
>
{
-private:
-
- typedef scanline_reader< Device
- , tiff_tag
- > this_t;
public: