[Boost-commit] svn:boost r65897 - in sandbox/gil/boost/gil/extension/io2: . detail

Subject: [Boost-commit] svn:boost r65897 - in sandbox/gil/boost/gil/extension/io2: . detail
From: dsaritz_at_[hidden]
Date: 2010-10-10 18:29:30

Author: psiha
Date: 2010-10-10 18:29:27 EDT (Sun, 10 Oct 2010)
New Revision: 65897
URL: http://svn.boost.org/trac/boost/changeset/65897

Log:
Switched to non-ICM enabled GDI+ functions.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/detail/gp_extern_lib_guard.hpp |    22 +++++++++++-----------                  
   sandbox/gil/boost/gil/extension/io2/gp_image.hpp                   |     6 +++---                                  
   2 files changed, 14 insertions(+), 14 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/detail/gp_extern_lib_guard.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/detail/gp_extern_lib_guard.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/detail/gp_extern_lib_guard.hpp	2010-10-10 18:29:27 EDT (Sun, 10 Oct 2010)
@@ -92,17 +92,17 @@
     BOOST_GIL_EXTERNAL_LIB,
     (( ALWAYS, Gdiplus::Status, WINAPI, GdiplusStartup     , ( ULONG_PTR * )( const Gdiplus::GdiplusStartupInput * )( Gdiplus::GdiplusStartupOutput * )                                                    ))
     (( ALWAYS, VOID           , WINAPI, GdiplusShutdown    , ( ULONG_PTR )                                                                                                                                 ))
-    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromStreamICM ), ( IStream * )( Gdiplus::GpBitmap ** )                                                                                                         ))
-    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromFileICM   ), ( GDIPCONST WCHAR* )( Gdiplus::GpBitmap ** )                                                                                                  ))
-    (( ALWAYS, GP_FUNCTION( GdipDisposeImage              ), ( Gdiplus::GpImage  * )                                                                                                                        ))
-    (( ALWAYS, GP_FUNCTION( GdipGetImageDimension         ), ( Gdiplus::GpImage  * )( Gdiplus::REAL * )( Gdiplus::REAL * )                                                                                  ))
-    (( ALWAYS, GP_FUNCTION( GdipGetImagePixelFormat       ), ( Gdiplus::GpImage  * )( Gdiplus::PixelFormat * )                                                                                              ))
-    (( ALWAYS, GP_FUNCTION( GdipBitmapLockBits            ), ( Gdiplus::GpBitmap * )( GDIPCONST Gdiplus::GpRect* )( UINT )( Gdiplus::PixelFormat )( Gdiplus::BitmapData* )                                  ))
-    (( ALWAYS, GP_FUNCTION( GdipBitmapUnlockBits          ), ( Gdiplus::GpBitmap * )( Gdiplus::BitmapData* )                                                                                                ))
-    (( ALWAYS, GP_FUNCTION( GdipSaveImageToFile           ), ( Gdiplus::GpImage  * )( GDIPCONST WCHAR* )( GDIPCONST CLSID* )( GDIPCONST Gdiplus::EncoderParameters* )                                       ))
-    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromScan0     ), ( INT )( INT )( INT )( Gdiplus::PixelFormat )( BYTE * )( Gdiplus::GpBitmap** )                                                                ))
-    (( GP1_1 , GP_FUNCTION( GdipInitializePalette         ), ( OUT Gdiplus::ColorPalette * )( Gdiplus::PaletteType )( INT )( BOOL )( Gdiplus::GpBitmap * )                                                 ))
-    (( GP1_1 , GP_FUNCTION( GdipBitmapConvertFormat       ), ( IN Gdiplus::GpBitmap * )( Gdiplus::PixelFormat )( Gdiplus::DitherType )( Gdiplus::PaletteType )( Gdiplus::ColorPalette * )( Gdiplus::REAL ) ))
+    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromStream ), ( IStream * )( Gdiplus::GpBitmap ** )                                                                                                         ))
+    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromFile   ), ( GDIPCONST WCHAR* )( Gdiplus::GpBitmap ** )                                                                                                  ))
+    (( ALWAYS, GP_FUNCTION( GdipDisposeImage           ), ( Gdiplus::GpImage  * )                                                                                                                        ))
+    (( ALWAYS, GP_FUNCTION( GdipGetImageDimension      ), ( Gdiplus::GpImage  * )( Gdiplus::REAL * )( Gdiplus::REAL * )                                                                                  ))
+    (( ALWAYS, GP_FUNCTION( GdipGetImagePixelFormat    ), ( Gdiplus::GpImage  * )( Gdiplus::PixelFormat * )                                                                                              ))
+    (( ALWAYS, GP_FUNCTION( GdipBitmapLockBits         ), ( Gdiplus::GpBitmap * )( GDIPCONST Gdiplus::GpRect* )( UINT )( Gdiplus::PixelFormat )( Gdiplus::BitmapData* )                                  ))
+    (( ALWAYS, GP_FUNCTION( GdipBitmapUnlockBits       ), ( Gdiplus::GpBitmap * )( Gdiplus::BitmapData* )                                                                                                ))
+    (( ALWAYS, GP_FUNCTION( GdipSaveImageToFile        ), ( Gdiplus::GpImage  * )( GDIPCONST WCHAR* )( GDIPCONST CLSID* )( GDIPCONST Gdiplus::EncoderParameters* )                                       ))
+    (( ALWAYS, GP_FUNCTION( GdipCreateBitmapFromScan0  ), ( INT )( INT )( INT )( Gdiplus::PixelFormat )( BYTE * )( Gdiplus::GpBitmap** )                                                                ))
+    (( GP1_1 , GP_FUNCTION( GdipInitializePalette      ), ( OUT Gdiplus::ColorPalette * )( Gdiplus::PaletteType )( INT )( BOOL )( Gdiplus::GpBitmap * )                                                 ))
+    (( GP1_1 , GP_FUNCTION( GdipBitmapConvertFormat    ), ( IN Gdiplus::GpBitmap * )( Gdiplus::PixelFormat )( Gdiplus::DitherType )( Gdiplus::PaletteType )( Gdiplus::ColorPalette * )( Gdiplus::REAL ) ))
 );
 
 #undef ALWAYS

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	2010-10-10 18:29:27 EDT (Sun, 10 Oct 2010)
@@ -363,13 +363,13 @@
 public: /// \ingroup Construction
     explicit gp_image( wchar_t const * const filename )
     {
-        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromFileICM( filename, &pBitmap_ ) );
+        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromFile( filename, &pBitmap_ ) );
         BOOST_ASSERT( pBitmap_ );
     }
 
     explicit gp_image( char const * const filename )
     {
-        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromFileICM( detail::wide_path( filename ), &pBitmap_ ) );
+        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromFile( detail::wide_path( filename ), &pBitmap_ ) );
         BOOST_ASSERT( pBitmap_ );
     }
 
@@ -377,7 +377,7 @@
     // lazy evaluation).
     explicit gp_image( IStream & stream )
     {
-        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromStreamICM( &stream, &pBitmap_ ) );
+        detail::ensure_result( Gdiplus::DllExports::GdipCreateBitmapFromStream( &stream, &pBitmap_ ) );
         BOOST_ASSERT( pBitmap_ );
     }