Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / io / read_image.hpp

diff --git a/boost/gil/io/read_image.hpp b/boost/gil/io/read_image.hpp
index 8107d71..6179c7b 100644 (file)
--- a/boost/gil/io/read_image.hpp
+++ b/boost/gil/io/read_image.hpp
@@ -15,9 +15,7 @@
 #include <boost/gil/io/device.hpp>
 #include <boost/gil/io/get_reader.hpp>
 #include <boost/gil/io/path_spec.hpp>
-
-#include <boost/mpl/and.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <type_traits>
 
@@ -34,7 +32,7 @@ inline
 void read_image(Reader reader, Image& img,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_reader<Reader>,
             is_format_tag<typename Reader::format_tag_t>,
@@ -63,7 +61,7 @@ void read_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>,
@@ -92,7 +90,7 @@ inline
 void read_image(Device& file, Image& img, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>,
@@ -124,7 +122,7 @@ void read_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_supported_path_spec<String>,
             is_format_tag<FormatTag>,
@@ -153,7 +151,7 @@ inline
 void read_image(String const& file_name, Image& img, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_<detail::is_supported_path_spec<String>,
+        mp11::mp_and<detail::is_supported_path_spec<String>,
         is_format_tag<FormatTag>,
         is_read_supported
         <
@@ -177,7 +175,7 @@ inline
 void read_image(Reader& reader, any_image<Images>& images,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_dynamic_image_reader<Reader>,
             is_format_tag<typename Reader::format_tag_t>
@@ -189,7 +187,7 @@ void read_image(Reader& reader, any_image<Images>& images,
 
 /// \brief Reads an image without conversion. Image memory is allocated.
 /// \param file      It's a device. Must satisfy is_adaptable_input_device metafunction.
-/// \param images    Dynamic image ( mpl::vector ). See boost::gil::dynamic_image extension.
+/// \param images    Dynamic image (mp11::mp_list). See boost::gil::dynamic_image extension.
 /// \param settings  Specifies read settings depending on the image format.
 /// \throw std::ios_base::failure
 template <typename Device, typename Images, typename FormatTag>
@@ -200,7 +198,7 @@ void read_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -215,7 +213,7 @@ void read_image(
 
 /// \brief Reads an image without conversion. Image memory is allocated.
 /// \param file      It's a device. Must satisfy is_adaptable_input_device metafunction.
-/// \param images    Dynamic image ( mpl::vector ). See boost::gil::dynamic_image extension.
+/// \param images    Dynamic image (mp11::mp_list). See boost::gil::dynamic_image extension.
 /// \param tag       Defines the image format. Must satisfy is_format_tag metafunction.
 /// \throw std::ios_base::failure
 template <typename Device, typename Images, typename FormatTag>
@@ -223,7 +221,7 @@ inline
 void read_image(Device& file, any_image<Images>& images, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -238,7 +236,7 @@ void read_image(Device& file, any_image<Images>& images, FormatTag const& tag,
 
 /// \brief Reads an image without conversion. Image memory is allocated.
 /// \param file_name File name. Must satisfy is_supported_path_spec metafunction.
-/// \param images    Dynamic image ( mpl::vector ). See boost::gil::dynamic_image extension.
+/// \param images    Dynamic image (mp11::mp_list). See boost::gil::dynamic_image extension.
 /// \param settings  Specifies read settings depending on the image format.
 /// \throw std::ios_base::failure
 template <typename String, typename Images, typename FormatTag>
@@ -249,7 +247,7 @@ void read_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_supported_path_spec<String>,
             is_format_tag<FormatTag>
@@ -264,7 +262,7 @@ void read_image(
 
 /// \brief Reads an image without conversion. Image memory is allocated.
 /// \param file_name File name. Must satisfy is_supported_path_spec metafunction.
-/// \param images    Dynamic image ( mpl::vector ). See boost::gil::dynamic_image extension.
+/// \param images    Dynamic image (mp11::mp_list). See boost::gil::dynamic_image extension.
 /// \param tag       Defines the image format. Must satisfy is_format_tag metafunction.
 /// \throw std::ios_base::failure
 template <typename String, typename Images, typename FormatTag>
@@ -272,7 +270,7 @@ inline
 void read_image(String const& file_name, any_image<Images>& images, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_supported_path_spec<String>,
             is_format_tag<FormatTag>