import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / gil / rgb.hpp

diff --git a/ceph/src/boost/boost/gil/rgb.hpp b/ceph/src/boost/boost/gil/rgb.hpp
index 64e3aca6cd9ce5c7485f31c0331504e662e9331d..1ab15f8e90a5ed33d4dc52bca971739509558042 100644 (file)
--- a/ceph/src/boost/boost/gil/rgb.hpp
+++ b/ceph/src/boost/boost/gil/rgb.hpp
@@ -1,32 +1,19 @@
-/*
-    Copyright 2005-2007 Adobe Systems Incorporated
-   
-    Use, modification and distribution are subject to the Boost Software License,
-    Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-    http://www.boost.org/LICENSE_1_0.txt).
-
-    See http://opensource.adobe.com/gil for most recent version including documentation.
-*/
-
-/*************************************************************************************************/
-
-#ifndef GIL_RGB_H
-#define GIL_RGB_H
-
-////////////////////////////////////////////////////////////////////////////////////////
-/// \file
-/// \brief Support for RGB color space and variants
-/// \author Lubomir Bourdev and Hailin Jin \n
-///         Adobe Systems Incorporated
-/// \date 2005-2007 \n Last updated on October 10, 2007
-////////////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2005-2007 Adobe Systems Incorporated
+//
+// Distributed under the Boost Software License, Version 1.0
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+#ifndef BOOST_GIL_RGB_HPP
+#define BOOST_GIL_RGB_HPP
+
+#include <boost/gil/metafunctions.hpp>
+#include <boost/gil/planar_pixel_iterator.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <cstddef>
-#include <boost/mpl/range_c.hpp>
-#include <boost/mpl/vector_c.hpp>
-#include "gil_config.hpp"
-#include "metafunctions.hpp"
-#include "planar_pixel_iterator.hpp"
+#include <type_traits>
 
 namespace boost { namespace gil {
 
@@ -34,37 +21,43 @@ namespace boost { namespace gil {
 /// \{
 
 /// \brief Red
-struct red_t {};    
+struct red_t {};
 
 /// \brief Green
 struct green_t {};
 
 /// \brief Blue
-struct blue_t {}; 
+struct blue_t {};
 /// \}
 
 /// \ingroup ColorSpaceModel
-typedef mpl::vector3<red_t,green_t,blue_t> rgb_t;
+using rgb_t = mp11::mp_list<red_t, green_t, blue_t>;
 
 /// \ingroup LayoutModel
-typedef layout<rgb_t> rgb_layout_t;
+using rgb_layout_t = layout<rgb_t>;
+
 /// \ingroup LayoutModel
-typedef layout<rgb_t, mpl::vector3_c<int,2,1,0> > bgr_layout_t;
+using bgr_layout_t = layout<rgb_t, mp11::mp_list_c<int, 2, 1, 0>>;
 
 /// \ingroup ImageViewConstructors
 /// \brief from raw RGB planar data
 template <typename IC>
 inline
-typename type_from_x_iterator<planar_pixel_iterator<IC,rgb_t> >::view_t
-planar_rgb_view(std::size_t width, std::size_t height,
-                IC r, IC g, IC b,
-                std::ptrdiff_t rowsize_in_bytes) {
-    typedef typename type_from_x_iterator<planar_pixel_iterator<IC,rgb_t> >::view_t RView;
-    return RView(width, height,
-                 typename RView::locator(planar_pixel_iterator<IC,rgb_t>(r,g,b),
-                                         rowsize_in_bytes));
+auto planar_rgb_view(
+    std::size_t width, std::size_t height,
+    IC r, IC g, IC b,
+    std::ptrdiff_t rowsize_in_bytes)
+    -> typename type_from_x_iterator<planar_pixel_iterator<IC, rgb_t> >::view_t
+{
+    using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC, rgb_t>>::view_t;
+
+    return view_t(
+        width, height,
+        typename view_t::locator(
+            planar_pixel_iterator<IC, rgb_t>(r, g, b),
+            rowsize_in_bytes));
 }
 
-} }  // namespace boost::gil
+}}  // namespace boost::gil
 
 #endif