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

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

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

Log:
Fixed compiler errors.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/detail/wic_extern_lib_guard.hpp |     4 ++++                                    
   sandbox/gil/boost/gil/extension/io2/gp_image.hpp                    |     2 ++                                      
   sandbox/gil/boost/gil/extension/io2/wic_image.hpp                   |     9 +++++++--                               
   3 files changed, 13 insertions(+), 2 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/detail/wic_extern_lib_guard.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/detail/wic_extern_lib_guard.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/detail/wic_extern_lib_guard.hpp	2010-10-10 18:28:17 EDT (Sun, 10 Oct 2010)
@@ -21,9 +21,13 @@
 
 #include <boost/preprocessor/comparison/greater.hpp>
 
+#include <cstdint>
+
 #if defined( _STDINT ) && !defined( _INTSAFE_H_INCLUDED_ )
     #define _INTSAFE_H_INCLUDED_
 #endif
+#define COM_NO_WINDOWS_H
+#include "objbase.h"
 #include "wincodec.h"
 //------------------------------------------------------------------------------
 namespace boost

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:28:17 EDT (Sun, 10 Oct 2010)
@@ -484,7 +484,9 @@
         BOOST_ASSERT( !dimensions_mismatch( view ) );
         //BOOST_ASSERT( !formats_mismatch   ( view ) );
 
+        using namespace detail ;
         using namespace Gdiplus;
+
         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 );
         BitmapData bitmapData;

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	2010-10-10 18:28:17 EDT (Sun, 10 Oct 2010)
@@ -20,9 +20,16 @@
 #define wic_image_hpp__78D710F7_11C8_4023_985A_22B180C9A476
 //------------------------------------------------------------------------------
 #include "detail/io_error.hpp"
+#include "detail/libx_shared.hpp" //...zzz...
 #include "detail/wic_extern_lib_guard.hpp"
 #include "detail/windows_shared.hpp"
 #include "detail/windows_shared_istreams.hpp"
+#include "formatted_image.hpp"
+
+#include <boost/mpl/vector_c.hpp> //...missing from metafuncitons.hpp...
+#include "boost/gil/metafunctions.hpp"
+#include "boost/gil/rgb.hpp"
+#include "boost/gil/typedefs.hpp"
 
 #include <boost/array.hpp>
 #include <boost/mpl/eval_if.hpp>
@@ -31,8 +38,6 @@
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_pod.hpp>
 
-#include "wincodec.h"
-
 #include <algorithm>
 //------------------------------------------------------------------------------
 namespace boost