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

Subject: [Boost-commit] svn:boost r65739 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2010-10-03 15:15:32

Author: psiha
Date: 2010-10-03 15:15:31 EDT (Sun, 03 Oct 2010)
New Revision: 65739
URL: http://svn.boost.org/trac/boost/changeset/65739

Log:
Removed unnecessary include directives.
Minor refactoring.
Text files modified: 
   sandbox/gil/boost/gil/extension/io2/formatted_image.hpp |    18 +++++-------------                      
   sandbox/gil/boost/gil/extension/io2/gp_image.hpp        |     3 ++-                                     
   sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp   |     5 ++++-                                   
   sandbox/gil/boost/gil/extension/io2/wic_image.hpp       |     3 +--                                     
   4 files changed, 12 insertions(+), 17 deletions(-)

Modified: sandbox/gil/boost/gil/extension/io2/formatted_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/formatted_image.hpp	(original)
+++ sandbox/gil/boost/gil/extension/io2/formatted_image.hpp	2010-10-03 15:15:31 EDT (Sun, 03 Oct 2010)
@@ -19,14 +19,11 @@
 #ifndef formatted_image_hpp__C34C1FB0_A4F5_42F3_9318_5805B88CFE49
 #define formatted_image_hpp__C34C1FB0_A4F5_42F3_9318_5805B88CFE49
 //------------------------------------------------------------------------------
-/// \todo Investigate whether gil_all.hpp is indeed necessary.
-///                                           (26.07.2010.) (Domagoj Saric)
-#include "../../gil_all.hpp"
-
 #include "detail/io_error.hpp"
 #include "detail/switch.hpp"
 
-#include <boost/gil/extension/dynamic_image/any_image.hpp>
+#include "boost/gil/extension/dynamic_image/any_image.hpp"
+#include "boost/gil/typedefs.hpp"
 
 #include <boost/compressed_pair.hpp>
 #ifdef _DEBUG
@@ -245,14 +242,9 @@
 NewView const & offset_new_view( NewView const & new_view, View const & ) { return new_view; }
 
 
-template <typename View>
-struct get_original_view_t;
-
-template <typename Locator>
-struct get_original_view_t<image_view<Locator> > { typedef image_view<Locator> type; };
-
-template <typename View, typename Offset>
-struct get_original_view_t<offset_view_t<View, Offset> > { typedef View type; };
+template <typename View                 > struct get_original_view_t;
+template <typename Locator              > struct get_original_view_t<image_view<Locator>         > { typedef image_view<Locator> type; };
+template <typename View, typename Offset> struct get_original_view_t<offset_view_t<View, Offset> > { typedef View                type; };
 
 // Tag base classes for writer implementations.
 struct configure_on_write_writer {};

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-03 15:15:31 EDT (Sun, 03 Oct 2010)
@@ -19,13 +19,14 @@
 #ifndef gp_private_base_hpp__3B1ED5BC_42C6_4EC6_B700_01C1B8646431
 #define gp_private_base_hpp__3B1ED5BC_42C6_4EC6_B700_01C1B8646431
 //------------------------------------------------------------------------------
-#include "../../gil_all.hpp"
 #include "detail/io_error.hpp"
 #include "detail/gp_extern_lib_guard.hpp"
 #include "detail/windows_shared.hpp"
 #include "detail/windows_shared_istreams.hpp"
 #include "formatted_image.hpp"
 
+#include "boost/gil/packed_pixel.hpp"
+
 #include <boost/array.hpp>
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/integral_c.hpp>

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	2010-10-03 15:15:31 EDT (Sun, 03 Oct 2010)
@@ -236,7 +236,10 @@
 };
 
 
-class libjpeg_writer : private libjpeg_base, public configure_on_write_writer
+class libjpeg_writer
+    :
+    private libjpeg_base,
+    public  configure_on_write_writer
 {
 public:
     explicit libjpeg_writer( char const * const p_target_file_name )

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-03 15:15:31 EDT (Sun, 03 Oct 2010)
@@ -19,7 +19,6 @@
 #ifndef wic_image_hpp__78D710F7_11C8_4023_985A_22B180C9A476
 #define wic_image_hpp__78D710F7_11C8_4023_985A_22B180C9A476
 //------------------------------------------------------------------------------
-#include "../../gil_all.hpp"
 #include "detail/io_error.hpp"
 #include "detail/wic_extern_lib_guard.hpp"
 #include "detail/windows_shared.hpp"
@@ -30,7 +29,7 @@
 #include <boost/mpl/integral_c.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/static_assert.hpp>
-#include "boost/type_traits/is_pod.hpp"
+#include <boost/type_traits/is_pod.hpp>
 
 #include "wincodec.h"