update boost

linx64/include/boost/gil/extension/io/jpeg/detail/is_allowed.hpp

@@ -10,11 +10,13 @@
 
 #include <boost/gil/extension/io/jpeg/tags.hpp>
 
+#include <type_traits>
+
 namespace boost { namespace gil { namespace detail {
 
 template< typename View >
 bool is_allowed( const image_read_info< jpeg_tag >& info
-               , mpl::true_   // is read_and_no_convert
+               , std::true_type   // is read_and_no_convert
                )
 {
     if( info._color_space == JCS_YCbCr )
@@ -32,7 +34,7 @@ bool is_allowed( const image_read_info< jpeg_tag >& info
 
 template< typename View >
 bool is_allowed( const image_read_info< jpeg_tag >& /* info */
-               , mpl::false_  // is read_and_convert
+               , std::false_type  // is read_and_convert
                )
 {
     return true;

linx64/include/boost/gil/extension/io/jpeg/detail/read.hpp

@@ -12,14 +12,15 @@
 #include <boost/gil/extension/io/jpeg/detail/base.hpp>
 #include <boost/gil/extension/io/jpeg/detail/is_allowed.hpp>
 
+#include <boost/gil/io/detail/dynamic.hpp>
 #include <boost/gil/io/base.hpp>
 #include <boost/gil/io/conversion_policies.hpp>
 #include <boost/gil/io/device.hpp>
-#include <boost/gil/io/dynamic_io_new.hpp>
 #include <boost/gil/io/reader_base.hpp>
 #include <boost/gil/io/typedefs.hpp>
 
 #include <csetjmp>
+#include <type_traits>
 #include <vector>
 
 namespace boost { namespace gil {
@@ -99,7 +100,7 @@ public:
 
         this->get()->dct_method = this->_settings._dct_method;
 
-        using is_read_and_convert_t = typename is_same
+        using is_read_and_convert_t = typename std::is_same
             <
                 ConversionPolicy,
                 detail::read_and_no_convert
@@ -275,15 +276,15 @@ public:
               )
     {}
 
-    template< typename Images >
-    void apply( any_image< Images >& images )
+    template< typename ...Images >
+    void apply( any_image< Images... >& images )
     {
         detail::jpeg_type_format_checker format_checker( this->_info._color_space != JCS_YCbCr
                                                        ? this->_info._color_space
                                                        : JCS_RGB
                                                        );
 
-        if( !construct_matched( images
+        if( !detail::construct_matched( images
                               , format_checker
                               ))
         {
@@ -299,8 +300,8 @@ public:
                                     , parent_t
                                     > op( this );
 
-            apply_operation( view( images )
-                           , op
+            variant2::visit( op
+                           , view( images )
                            );
         }
     }

linx64/include/boost/gil/extension/io/jpeg/detail/reader_backend.hpp

@@ -189,7 +189,7 @@ public:
     }
 
     /// Check if image is large enough.
-    void check_image_size( const point_t& img_dim )
+    void check_image_size( point_t const& img_dim )
     {
         if( _settings._dim.x > 0 )
         {

linx64/include/boost/gil/extension/io/jpeg/detail/supported_types.hpp

@@ -13,8 +13,7 @@
 #include <boost/gil/channel.hpp>
 #include <boost/gil/color_base.hpp>
 
-#include <boost/mpl/bool_fwd.hpp>
-#include <boost/type_traits/is_same.hpp>
+#include <type_traits>
 
 namespace boost { namespace gil { namespace detail {
 
@@ -78,14 +77,17 @@ struct jpeg_write_support<uint8_t
 
 } // namespace detail
 
-template< typename Pixel >
-struct is_read_supported< Pixel
-                        , jpeg_tag
-                        >
-    : mpl::bool_< detail::jpeg_read_support< typename channel_type< Pixel >::type
-                                           , typename color_space_type< Pixel >::type
-                                           >::is_supported
-                >
+template<typename Pixel>
+struct is_read_supported<Pixel, jpeg_tag>
+    : std::integral_constant
+    <
+        bool,
+        detail::jpeg_read_support
+        <
+            typename channel_type<Pixel>::type,
+            typename color_space_type<Pixel>::type
+        >::is_supported
+    >
 {
     using parent_t = detail::jpeg_read_support
         <
@@ -96,14 +98,17 @@ struct is_read_supported< Pixel
     static const typename jpeg_color_space::type _color_space = parent_t::_color_space;
 };
 
-template< typename Pixel >
-struct is_write_supported< Pixel
-                         , jpeg_tag
-                         >
-    : mpl::bool_< detail::jpeg_write_support< typename channel_type< Pixel >::type
-                                            , typename color_space_type< Pixel >::type
-                                            >::is_supported
-                >
+template<typename Pixel>
+struct is_write_supported<Pixel, jpeg_tag>
+    : std::integral_constant
+    <
+        bool,
+        detail::jpeg_write_support
+        <
+            typename channel_type<Pixel>::type,
+            typename color_space_type<Pixel>::type
+        >::is_supported
+    >
 {};
 
 } // namespace gil

linx64/include/boost/gil/extension/io/jpeg/detail/write.hpp

@@ -14,7 +14,7 @@
 
 #include <boost/gil/io/base.hpp>
 #include <boost/gil/io/device.hpp>
-#include <boost/gil/io/dynamic_io_new.hpp>
+#include <boost/gil/io/detail/dynamic.hpp>
 
 #include <vector>
 
@@ -132,6 +132,8 @@ private:
                                 , 1
                                 );
         }
+
+        jpeg_finish_compress ( this->get() );
     }
 };
 
@@ -158,14 +160,14 @@ public:
               )
     {}
 
-    template< typename Views >
-    void apply( const any_image_view< Views >& views )
+    template< typename ...Views >
+    void apply( const any_image_view< Views... >& views )
     {
         detail::dynamic_io_fnobj< detail::jpeg_write_is_supported
                                 , parent_t
                                 > op( this );
 
-        apply_operation( views, op );
+        variant2::visit( op, views );
     }
 };
 

linx64/include/boost/gil/extension/io/jpeg/detail/writer_backend.hpp

@@ -113,7 +113,9 @@ public:
 
     ~writer_backend()
     {
-        jpeg_finish_compress ( get() );
+        // JPEG compression object destruction does not signal errors,
+        // unlike jpeg_finish_compress called elsewhere,
+        // so there is no need for the setjmp bookmark here.
         jpeg_destroy_compress( get() );
     }