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

Subject: [Boost-commit] svn:boost r68134 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2011-01-13 18:41:40

Author: psiha
Date: 2011-01-13 18:41:37 EST (Thu, 13 Jan 2011)
New Revision: 68134
URL: http://svn.boost.org/trac/boost/changeset/68134

Log:
Compilation error fixes.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/gp_image.hpp      |     5 +++--                                   
   sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp |     4 ++--                                    
   sandbox/gil/boost/gil/extension/io2/wic_image.hpp     |    10 +++++-----                              
   3 files changed, 10 insertions(+), 9 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/gp_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/gp_image.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/gp_image.hpp	2011-01-13 18:41:37 EST (Thu, 13 Jan 2011)
@@ -540,6 +540,7 @@
 
         point2<std::ptrdiff_t> const & targetDimensions( original_view( view ).dimensions() );
         gp_roi const roi( get_offset<gp_roi::offset_t>( view ), targetDimensions.x, targetDimensions.y );
+        format_t const my_format( gil_to_gp_format<typename View::value_type, is_planar<View>::value>::value );
         BitmapData bitmapData;
         ensure_result
         (
@@ -548,11 +549,11 @@
                 pBitmap_,
                 &roi,
                 ImageLockModeRead,
-                view_gp_format::apply<MyView>::value,
+                my_format,
                 &bitmapData
             )
         );
-        BOOST_ASSERT( bitmapData.PixelFormat == view_gp_format::apply<MyView>::value );
+        BOOST_ASSERT( bitmapData.PixelFormat == my_format );
         copy_and_convert_pixels // This must not throw!
         (
             interleaved_view

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-13 18:41:37 EST (Thu, 13 Jan 2011)
@@ -394,7 +394,7 @@
         (
             /*std*/::write
             (
-                reinterpret_cast<int>( compressor().client_data ),
+                reinterpret_cast<long>( compressor().client_data ),
                 write_buffer_.begin(),
                 number_of_bytes
             ) != static_cast<int>( number_of_bytes )
@@ -446,7 +446,7 @@
     static void BF_CDECL term_and_close_fd_destination( j_compress_ptr const p_cinfo )
     {
         term_fd_destination( p_cinfo );
-        BOOST_VERIFY( /*std*/::close( reinterpret_cast<int>( get_writer( p_cinfo ).compressor().client_data ) ) == 0 );
+        BOOST_VERIFY( /*std*/::close( reinterpret_cast<long>( get_writer( p_cinfo ).compressor().client_data ) ) == 0 );
     }
 
 private:

Modified: sandbox/gil/boost/gil/extension/io2/wic_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/wic_image.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/wic_image.hpp	2011-01-13 18:41:37 EST (Thu, 13 Jan 2011)
@@ -153,8 +153,8 @@
     template <typename View>
     wic_view_data_t( View const & view, wic_roi::offset_t const & offset )
         :
-        p_roi_ ( static_cast<wic_roi const *>( optional_roi_.address() ) ),
-        format_( view_wic_format::apply<View>::value                     )
+        p_roi_ ( static_cast<wic_roi const *>( optional_roi_.address() )                          ),
+        format_( view_wic_format::apply<typename View::value_type, is_planar<View>::value>::value )
     {
         set_bitmapdata_for_view( view );
         new ( optional_roi_.address() ) wic_roi( offset, width_, height_ );
@@ -176,7 +176,7 @@
         height_     = view.height();
         stride_     = view.pixels().row_size();
         pixel_size_ = memunit_step( typename View::x_iterator() );
-        //format_     = view_wic_format::apply<View>::value;
+        //format_     = view_wic_format::apply<typename View::value_type, is_planar<View>::value>::value;
         p_buffer_   = detail::formatted_image_base::get_raw_data( view );
     }
 
@@ -398,7 +398,7 @@
     //            view.width(),
     //            view.height(),
     //            view.pixels().row_size(),
-    //            view_wic_format::apply<View>::value,
+    //            view_wic_format::apply<typename View::value_type, is_planar<View>::value>::value,
     //            get_raw_data( view ),
     //            &pBitmap_
     //        )
@@ -503,7 +503,7 @@
         #ifndef NDEBUG
             WICPixelFormatGUID locked_format;
             verify_result( p_bitmap_lock->GetPixelFormat( &locked_format ) );
-            BOOST_ASSERT( locked_format == view_wic_format::apply<MyView>::value );
+            BOOST_ASSERT( locked_format == view_wic_format::apply<typename View::value_type, is_planar<View>::value>::value );
         #endif
         copy_and_convert_pixels
         (