Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / extension / io / tiff / detail / write.hpp

diff --git a/boost/gil/extension/io/tiff/detail/write.hpp b/boost/gil/extension/io/tiff/detail/write.hpp
index c2d2099..601aba5 100644 (file)
--- a/boost/gil/extension/io/tiff/detail/write.hpp
+++ b/boost/gil/extension/io/tiff/detail/write.hpp
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 extern "C" {
@@ -39,7 +40,8 @@ template <typename PixelReference>
 struct my_interleaved_pixel_iterator_type_from_pixel_reference
 {
 private:
-    using pixel_t = typename remove_reference<PixelReference>::type::value_type;
+    using pixel_t = typename std::remove_reference<PixelReference>::type::value_type;
+
 public:
     using type = typename iterator_type_from_pixel
         <
@@ -162,7 +164,7 @@ private:
        template<typename View>
        void write_bit_aligned_view_to_dev( const View&       view
                                       , const std::size_t row_size_in_bytes
-                                      , const mpl::true_&    // has_alpha
+                                      , const std::true_type&    // has_alpha
                                       )
     {
         byte_vector_t row( row_size_in_bytes );
@@ -192,7 +194,7 @@ private:
        template<typename View>
        void write_bit_aligned_view_to_dev( const View&       view
                                       , const std::size_t row_size_in_bytes
-                                      , const mpl::false_&    // has_alpha
+                                      , const std::false_type&    // has_alpha
                                       )
     {
         byte_vector_t row( row_size_in_bytes );
@@ -222,11 +224,11 @@ private:
     template< typename View >
     void write_data( const View&   view
                    , std::size_t   row_size_in_bytes
-                   , const mpl::true_&    // bit_aligned
+                   , const std::true_type&    // bit_aligned
                    )
     {
         using colour_space_t = typename color_space_type<typename View::value_type>::type;
-        using has_alpha_t = mpl::bool_<mpl::contains<colour_space_t, alpha_t>::value>;
+        using has_alpha_t = mp11::mp_contains<colour_space_t, alpha_t>;
 
         write_bit_aligned_view_to_dev(view, row_size_in_bytes, has_alpha_t());
     }
@@ -235,7 +237,7 @@ private:
     void write_tiled_data( const View&            view
                          , tiff_tile_width::type  tw
                          , tiff_tile_length::type th
-                         , const mpl::true_&    // bit_aligned
+                         , const std::true_type&    // bit_aligned
                          )
     {
         byte_vector_t row( this->_io_dev.get_tile_size() );
@@ -249,7 +251,7 @@ private:
     template< typename View >
     void write_data( const View&   view
                    , std::size_t
-                   , const mpl::false_&    // bit_aligned
+                   , const std::false_type&    // bit_aligned
                    )
     {
         std::vector< pixel< typename channel_type< View >::type
@@ -283,7 +285,7 @@ private:
     void write_tiled_data( const View&            view
                          , tiff_tile_width::type  tw
                          , tiff_tile_length::type th
-                         , const mpl::false_&    // bit_aligned
+                         , const std::false_type&    // bit_aligned
                          )
     {
         byte_vector_t row( this->_io_dev.get_tile_size() );
@@ -302,7 +304,7 @@ private:
             >
        void write_tiled_view_to_dev( const View&  view
                                 , IteratorType it
-                                , const mpl::true_& // has_alpha
+                                , const std::true_type& // has_alpha
                                 )
     {
         auto pm_view = premultiply_view <typename View:: value_type>( view );
@@ -319,7 +321,7 @@ private:
             >
        void write_tiled_view_to_dev( const View&  view
                                 , IteratorType it
-                                , const mpl::false_& // has_alpha
+                                , const std::false_type& // has_alpha
                                 )
     {
         std::copy( view.begin()
@@ -359,7 +361,7 @@ private:
                                                       );
 
                     using colour_space_t = typename color_space_type<typename View::value_type>::type;
-                    using has_alpha_t = mpl::bool_<mpl::contains<colour_space_t, alpha_t>::value>;
+                    using has_alpha_t = mp11::mp_contains<colour_space_t, alpha_t>;
 
                     write_tiled_view_to_dev(tile_subimage_view, it, has_alpha_t());
                 }