diff options
Diffstat (limited to 'boost/gil/extension/io/targa/old.hpp')
| -rw-r--r-- | boost/gil/extension/io/targa/old.hpp | 61 |
1 files changed, 20 insertions, 41 deletions
diff --git a/boost/gil/extension/io/targa/old.hpp b/boost/gil/extension/io/targa/old.hpp index 05a3d680b5..18c095f307 100644 --- a/boost/gil/extension/io/targa/old.hpp +++ b/boost/gil/extension/io/targa/old.hpp @@ -1,24 +1,13 @@ -/* - Copyright 2010 Christian Henning - 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). -*/ - -/*************************************************************************************************/ - +// +// Copyright 2010 Christian Henning +// +// 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_EXTENSION_IO_TARGA_OLD_HPP #define BOOST_GIL_EXTENSION_IO_TARGA_OLD_HPP -//////////////////////////////////////////////////////////////////////////////////////// -/// \file -/// \brief -/// \author Christian Henning \n -/// -/// \date 2010 \n -/// -//////////////////////////////////////////////////////////////////////////////////////// - #include <boost/gil/extension/io/targa.hpp> namespace boost { namespace gil { @@ -26,33 +15,23 @@ namespace boost { namespace gil { /// \ingroup BMP_IO /// \brief Returns the width and height of the BMP file at the specified location. /// Throws std::ios_base::failure if the location does not correspond to a valid BMP file -template< typename String > -inline -point2< std::ptrdiff_t > targa_read_dimensions( const String& filename ) +template<typename String> +inline point_t targa_read_dimensions(String const& filename) { - typedef typename get_reader_backend< String - , targa_tag - >::type backend_t; - - backend_t backend = read_image_info( filename - , targa_tag() - ); - - return point2< std::ptrdiff_t >( backend._info._width - , backend._info._height - ); + using backend_t = typename get_reader_backend<String, targa_tag>::type; + backend_t backend = read_image_info(filename, targa_tag()); + return { backend._info._width, backend._info._height }; } - /// \ingroup BMP_IO /// \brief Loads the image specified by the given targa image file name into the given view. /// Triggers a compile assert if the view color space and channel depth are not supported by the BMP library or by the I/O extension. -/// Throws std::ios_base::failure if the file is not a valid BMP file, or if its color space or channel depth are not +/// Throws std::ios_base::failure if the file is not a valid BMP file, or if its color space or channel depth are not /// compatible with the ones specified by View, or if its dimensions don't match the ones of the view. template< typename String , typename View > -inline +inline void targa_read_view( const String& filename , const View& view ) @@ -66,12 +45,12 @@ void targa_read_view( const String& filename /// \ingroup BMP_IO /// \brief Allocates a new image whose dimensions are determined by the given bmp image file, and loads the pixels into it. /// Triggers a compile assert if the image color space or channel depth are not supported by the BMP library or by the I/O extension. -/// Throws std::ios_base::failure if the file is not a valid BMP file, or if its color space or channel depth are not +/// Throws std::ios_base::failure if the file is not a valid BMP file, or if its color space or channel depth are not /// compatible with the ones specified by Image template< typename String , typename Image > -inline +inline void targa_read_image( const String& filename , Image& img ) @@ -89,7 +68,7 @@ template< typename String , typename View , typename CC > -inline +inline void targa_read_and_convert_view( const String& filename , const View& view , CC cc @@ -108,7 +87,7 @@ void targa_read_and_convert_view( const String& filename template< typename String , typename View > -inline +inline void targa_read_and_convert_view( const String& filename , const View& view ) @@ -126,7 +105,7 @@ template< typename String , typename Image , typename CC > -inline +inline void targa_read_and_convert_image( const String& filename , Image& img , CC cc @@ -145,7 +124,7 @@ void targa_read_and_convert_image( const String& filename template< typename String , typename Image > -inline +inline void targa_read_and_convert_image( const String filename , Image& img ) |