diff options
Diffstat (limited to 'boost/gil/extension/io/tiff/tags.hpp')
-rw-r--r-- | boost/gil/extension/io/tiff/tags.hpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/boost/gil/extension/io/tiff/tags.hpp b/boost/gil/extension/io/tiff/tags.hpp index fc21c48261..0acf49370d 100644 --- a/boost/gil/extension/io/tiff/tags.hpp +++ b/boost/gil/extension/io/tiff/tags.hpp @@ -44,7 +44,7 @@ struct tiff_property_base : property_base< T > /// this property: /// http://www.remotesensing.org/libtiff/man/TIFFGetField.3tiff.html /// http://www.remotesensing.org/libtiff/man/TIFFSetField.3tiff.html - typedef mpl:: vector <typename property_base <T>:: type> arg_types; + using arg_types = mpl::vector<typename property_base<unsigned short>::type>; }; /// baseline tags @@ -145,16 +145,17 @@ struct tiff_host_computer : tiff_property_base< std::string, TIFFTAG_HOSTCOMPUTE /// Helper structure for reading a color mapper. struct tiff_color_map { - typedef uint16_t* red_t; - typedef uint16_t* green_t; - typedef uint16_t* blue_t; + using red_t = uint16_t *; + using green_t = uint16_t *; + using blue_t = uint16_t *; static const unsigned int tag = TIFFTAG_COLORMAP; }; /// Defines type for extra samples property. -struct tiff_extra_samples : tiff_property_base< std:: vector <uint16_t>, TIFFTAG_EXTRASAMPLES > { - typedef mpl:: vector <uint16_t, uint16_t const *> arg_types; +struct tiff_extra_samples : tiff_property_base<std:: vector <uint16_t>, TIFFTAG_EXTRASAMPLES> +{ + using arg_types = mpl::vector<uint16_t, uint16_t const *>; }; /// Defines type for copyright property. @@ -184,14 +185,15 @@ struct tiff_tile_length : tiff_property_base< long, TIFFTAG_TILELENGTH > {}; #include <boost/mpl/integral_c.hpp> struct tiff_directory : property_base< tdir_t > { - typedef boost::mpl::integral_c< type, 0 > default_value; + using default_value = boost::mpl::integral_c<type, 0>; }; /// Non-baseline tags /// Defines type for icc profile property. -struct tiff_icc_profile : tiff_property_base< std:: vector <uint8_t>, TIFFTAG_ICCPROFILE > { - typedef mpl:: vector <uint32_t, void const *> arg_types; +struct tiff_icc_profile : tiff_property_base<std::vector<uint8_t>, TIFFTAG_ICCPROFILE> +{ + using arg_types = mpl::vector<uint32_t, void const *>; }; /// Read information for tiff images. |