From a3b179cfa8a221dbabd499cb5d4faedcab7de6ed Mon Sep 17 00:00:00 2001 From: Christian Henning Date: Tue, 30 Apr 2013 12:01:49 +0000 Subject: [PATCH] Some small corrections. [SVN r84090] --- .../toolbox/image_types/subchroma_image.hpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp b/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp index f46aae424..86cb1c6db 100644 --- a/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp +++ b/include/boost/gil/extension/toolbox/image_types/subchroma_image.hpp @@ -7,12 +7,12 @@ /*************************************************************************************************/ -#ifndef BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBSAMPLED_IMAGE_HPP -#define BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBSAMPLED_IMAGE_HPP +#ifndef BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBCHROMA_IMAGE_HPP +#define BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBCHROMA_IMAGE_HPP //////////////////////////////////////////////////////////////////////////////////////// /// \file subchroma_image.hpp -/// \brief Subsampled Image extension +/// \brief Subchroma Image extension /// \author Christian Henning \n /// /// \date 2013 \n @@ -120,7 +120,7 @@ struct subchroma_image_locator //////////////////////////////////////////////////////////////////////////////////////// /// \class subchroma_image_view /// \ingroup ImageViewModel PixelBasedModel -/// \brief A lightweight object that interprets a subsampled image.Models ImageViewConcept,PixelBasedConcept,HasDynamicXStepTypeConcept,HasDynamicYStepTypeConcept,HasTransposedTypeConcept +/// \brief A lightweight object that interprets a subchroma image. /// //////////////////////////////////////////////////////////////////////////////////////// template< typename Locator @@ -157,8 +157,8 @@ public: {} /// copy constructor - template< typename Subsampled_View > - subchroma_image_view( const Subsampled_View& v ) + template< typename Subchroma_View > + subchroma_image_view( const Subchroma_View& v ) : image_view< locator_t >( v ) {} @@ -236,7 +236,7 @@ struct Scaling_Factors /// \ingroup ImageModel PixelBasedModel /// \brief container interface over image view. Models ImageConcept, PixelBasedConcept /// -/// A subsampled image holds a bunch of planes which don't need to have the same resolution. +/// A subchroma image holds a bunch of planes which don't need to have the same resolution. /// //////////////////////////////////////////////////////////////////////////////////////// template< typename Pixel @@ -368,21 +368,21 @@ void fill_pixels( const subchroma_image_view< Locator, Factors >& view ///////////////////////////////////////////////////////////////////////////////////////// /// \ingroup ImageViewConstructors -/// \brief Creates a subsampled view from a raw memory +/// \brief Creates a subchroma view from a raw memory ///////////////////////////////////////////////////////////////////////////////////////// template< typename Pixel , typename Factors > typename subchroma_image< Pixel , Factors - >::view_t subsampled_view( std::size_t y_width - , std::size_t y_height - , unsigned char* y_base - ) + >::view_t subchroma_view( std::size_t y_width + , std::size_t y_height + , unsigned char* y_base + ) { typedef Scaling_Factors< mpl::at_c< Factors, 0 >::type::value - , mpl::at_c< Factors, 0 >::type::value - , mpl::at_c< Factors, 0 >::type::value + , mpl::at_c< Factors, 1 >::type::value + , mpl::at_c< Factors, 2 >::type::value > scaling_factors_t; std::size_t y_channel_size = 1; @@ -448,4 +448,4 @@ typename subchroma_image< Pixel } // namespace gil } // namespace boost -#endif // BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBSAMPLED_IMAGE_HPP +#endif // BOOST_GIL_EXTENSION_TOOLBOX_IMAGE_TYPES_SUBCHROMA_IMAGE_HPP