diff options
Diffstat (limited to 'boost/gil/extension/io/targa/detail/read.hpp')
| -rw-r--r-- | boost/gil/extension/io/targa/detail/read.hpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/boost/gil/extension/io/targa/detail/read.hpp b/boost/gil/extension/io/targa/detail/read.hpp index 9cd50cdaba..cf30a3a984 100644 --- a/boost/gil/extension/io/targa/detail/read.hpp +++ b/boost/gil/extension/io/targa/detail/read.hpp @@ -16,6 +16,7 @@ #include <boost/gil/io/bit_operations.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/row_buffer_helper.hpp> #include <boost/gil/io/typedefs.hpp> @@ -48,18 +49,12 @@ class reader< Device { private: - typedef reader< Device - , targa_tag - , ConversionPolicy - > this_t; - - typedef typename ConversionPolicy::color_converter_type cc_t; + using this_t = reader<Device, targa_tag, ConversionPolicy>; + using cc_t = typename ConversionPolicy::color_converter_type; public: - typedef reader_backend< Device, targa_tag > backend_t; - -public: + using backend_t = reader_backend<Device, targa_tag>; reader( const Device& io_dev , const image_read_settings< targa_tag >& settings @@ -87,9 +82,11 @@ public: template< typename View > void apply( const View& dst_view ) { - typedef typename is_same< ConversionPolicy - , detail::read_and_no_convert - >::type is_read_and_convert_t; + using is_read_and_convert_t = typename is_same + < + ConversionPolicy, + detail::read_and_no_convert + >::type; io_error_if( !detail::is_allowed< View >( this->_info, is_read_and_convert_t() ) , "Image types aren't compatible." @@ -352,10 +349,7 @@ class dynamic_image_reader< Device , detail::read_and_no_convert > { - typedef reader< Device - , targa_tag - , detail::read_and_no_convert - > parent_t; + using parent_t = reader<Device, targa_tag, detail::read_and_no_convert>; public: |