Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/boost/gil/extension/dynamic_image/algorithm.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void copy_and_convert_pixels(View const& src, any_image_view<Types...> const& ds

/// \ingroup ImageViewSTLAlgorithmsCopyAndConvertPixels
/// \tparam View Model ImageViewConcept
/// \tparam Type Model Boost.MP11-compatible list of models of MutableImageViewConcept
/// \tparam Types Model Boost.MP11-compatible list of models of MutableImageViewConcept
template <typename View, typename ...Types>
void copy_and_convert_pixels(View const& src, any_image_view<Types...> const& dst)
{
Expand Down
2 changes: 1 addition & 1 deletion include/boost/gil/extension/dynamic_image/any_image.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ auto view(any_image<Images...>& img) -> typename any_image<Images...>::view_t
}

/// \brief Returns the constant-pixel view of any image. The returned view is any view.
/// \tparam Types Models ImageVectorConcept
/// \tparam Images Models ImageVectorConcept
template <typename ...Images>
BOOST_FORCEINLINE
auto const_view(any_image<Images...> const& img) -> typename any_image<Images...>::const_view_t
Expand Down
2 changes: 1 addition & 1 deletion include/boost/gil/extension/io/png/tags.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ struct image_read_settings< png_tag > : public image_read_settings_base
/// Constructor
/// \param top_left Top left coordinate for reading partial image.
/// \param dim Dimensions for reading partial image.
/// \param gamma Screen gamma value.
/// \param screen_gamma Screen gamma value.
image_read_settings( point_t const& top_left
, point_t const& dim
, const bool apply_screen_gamma = false
Expand Down
2 changes: 1 addition & 1 deletion include/boost/gil/io/read_and_convert_image.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void read_and_convert_image(
}

/// \brief Reads and color-converts an image. Image memory is allocated. Default color converter is used.
/// \param file_name File name. Must satisfy is_supported_path_spec metafunction.
/// \param device It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param img The image in which the data is read into.
/// \param tag Defines the image format. Must satisfy is_format_tag metafunction.
/// \throw std::ios_base::failure
Expand Down
8 changes: 4 additions & 4 deletions include/boost/gil/io/read_and_convert_view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void read_and_convert_view(Reader& reader, View const& view,
}

/// \brief Reads and color-converts an image view. No memory is allocated.
/// \param file It's a device. Must satisfy is_input_device metafunction.
/// \param device It's a device. Must satisfy is_input_device metafunction.
/// \param view The image view in which the data is read into.
/// \param settings Specifies read settings depending on the image format.
/// \param cc Color converter function object.
Expand Down Expand Up @@ -132,7 +132,7 @@ void read_and_convert_view(
}

/// \brief Reads and color-converts an image view. No memory is allocated.
/// \param file It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param device It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param view The image view in which the data is read into.
/// \param cc Color converter function object.
/// \param tag Defines the image format. Must satisfy is_format_tag metafunction.
Expand Down Expand Up @@ -188,7 +188,7 @@ void read_and_convert_view(
}

/// \brief Reads and color-converts an image view. No memory is allocated.
/// \param file It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param device It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param view The image view in which the data is read into.
/// \param settings Specifies read settings depending on the image format.
/// \throw std::ios_base::failure
Expand Down Expand Up @@ -242,7 +242,7 @@ void read_and_convert_view(
}

/// \brief Reads and color-converts an image view. No memory is allocated.
/// \param file It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param device It's a device. Must satisfy is_input_device metafunction or is_adaptable_input_device.
/// \param view The image view in which the data is read into.
/// \param tag Defines the image format. Must satisfy is_format_tag metafunction.
/// \throw std::ios_base::failure
Expand Down
4 changes: 2 additions & 2 deletions include/boost/gil/io/reader_base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ struct reader_base
///
/// @tparam Image Image which implements boost::gil's ImageConcept.
///
/// @param img The image.
/// @param info The image read info.
/// @param img The image.
/// @param settings The image read settings.
template< typename Image >
void init_image( Image& img
, const image_read_settings< FormatTag >& settings
Expand Down
Loading