[Boost-commit] svn:boost r67691 - sandbox/gil/boost/gil/extension/io2

Subject: [Boost-commit] svn:boost r67691 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2011-01-05 16:34:08

Author: psiha
Date: 2011-01-05 16:34:07 EST (Wed, 05 Jan 2011)
New Revision: 67691
URL: http://svn.boost.org/trac/boost/changeset/67691

Log:
Minor fixes in the generic_convert_to_prepared_view<>() member function.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp	2011-01-05 16:34:07 EST (Wed, 05 Jan 2011)
@@ -638,11 +638,11 @@
         using namespace detail;
 
         typedef typename MyView::value_type pixel_t;
-        std::size_t         const scanline_length  ( decompressor().image_width * decompressor().num_components );
-        scoped_ptr<JSAMPLE> const p_scanline_buffer( new JSAMPLE[ scanline_length ] );
-        JSAMPROW       scanline   ( p_scanline_buffer.get()    );
-        JSAMPROW const scanlineEnd( scanline + scanline_length );
-        
+        std::size_t           const scanline_length  ( decompressor().image_width * decompressor().num_components );
+        scoped_array<JSAMPLE> const p_scanline_buffer( new JSAMPLE[ scanline_length ] );
+        JSAMPROW       scanline    ( p_scanline_buffer.get()    );
+        JSAMPROW const scanline_end( scanline + scanline_length );
+
         BOOST_ASSERT( closest_gil_supported_format() == view_libjpeg_format::apply<MyView>::value );
         setup_decompression
         (
@@ -671,7 +671,7 @@
 
             pixel_t const *   p_source_pixel( gil_reinterpret_cast_c<pixel_t const *>( scanline ) );
             target_x_iterator p_target_pixel( original_view( view ).row_begin( scanline_index )   );
-            while ( p_source_pixel < gil_reinterpret_cast_c<pixel_t const *>( scanlineEnd ) )
+            while ( p_source_pixel < gil_reinterpret_cast_c<pixel_t const *>( scanline_end ) )
             {
                 converter( *p_source_pixel, *p_target_pixel );
                 ++p_source_pixel;