Subject: [Boost-commit] svn:boost r65265 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2010-09-04 12:22:06
Author: psiha
Date: 2010-09-04 12:22:05 EDT (Sat, 04 Sep 2010)
New Revision: 65265
URL: http://svn.boost.org/trac/boost/changeset/65265
Log:
Replaced the custom libjpeg_roi class with the generic_vertical_roi.
Text files modified:
sandbox/gil/boost/gil/extension/io2/libjpeg_private_base.hpp | 32 +++-----------------------------
1 files changed, 3 insertions(+), 29 deletions(-)
Modified: sandbox/gil/boost/gil/extension/io2/libjpeg_private_base.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libjpeg_private_base.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libjpeg_private_base.hpp 2010-09-04 12:22:05 EDT (Sat, 04 Sep 2010)
@@ -17,11 +17,10 @@
#ifndef libjpeg_private_base_hpp__7C5F6951_A00F_4E0D_9783_488A49B1CA2B
#define libjpeg_private_base_hpp__7C5F6951_A00F_4E0D_9783_488A49B1CA2B
//------------------------------------------------------------------------------
-#include "../../gil_all.hpp"
#include "formatted_image.hpp"
#include "io_error.hpp"
+#include "detail/libx_shared.hpp"
-#include <boost/foreach.hpp>
#include <boost/smart_ptr/scoped_ptr.hpp>
#define JPEG_INTERNALS
@@ -67,32 +66,7 @@
> libjpeg_supported_pixel_formats;
-
-class libjpeg_roi
-{
-public:
- typedef std::ptrdiff_t value_type;
- typedef point2<value_type> point_t ;
-
- typedef value_type offset_t ;
-
-public:
- libjpeg_roi( value_type const start_row, value_type const end_row )
- :
- start_row_( start_row ),
- end_row_ ( end_row )
- {}
-
- value_type start_row() const { return start_row_; }
- value_type end_row () const { return end_row_ ; }
-
-private:
- void operator=( libjpeg_roi const & );
-
-private:
- value_type const start_row_;
- value_type const end_row_;
-};
+typedef generic_vertical_roi libjpeg_roi;
struct libjpeg_object_wrapper_t
@@ -105,7 +79,7 @@
};
-#if defined(BOOST_MSVC)
+#if defined( BOOST_MSVC )
# pragma warning( push )
# pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif