Subject: [Boost-commit] svn:boost r67099 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2010-12-08 04:50:32
Author: psiha
Date: 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
New Revision: 67099
URL: http://svn.boost.org/trac/boost/changeset/67099
Log:
Fixed reader and writer specifications to work better with the formatted_image<> read() and write() utility member functions.
Text files modified:
sandbox/gil/boost/gil/extension/io2/gp_image.hpp | 26 +++++++++++++-------------
sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp | 6 +++---
sandbox/gil/boost/gil/extension/io2/libpng_image.hpp | 8 ++++----
sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp | 4 ++--
sandbox/gil/boost/gil/extension/io2/wic_image.hpp | 12 ++++++------
5 files changed, 28 insertions(+), 28 deletions(-)
Modified: sandbox/gil/boost/gil/extension/io2/gp_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/gp_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/gp_image.hpp 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
@@ -280,21 +280,21 @@
struct is_supported : detail::is_supported<view_to_native_format::apply<View>::value> {};
typedef mpl::map5
- <
- mpl::pair<char const *, gp_image >,
- mpl::pair<wchar_t const *, gp_image >,
- mpl::pair<IStream &, gp_image >,
- mpl::pair<FILE &, detail::input_FILE_for_IStream_extender <gp_image> >,
- mpl::pair<memory_chunk_t const &, detail::memory_chunk_for_IStream_extender<gp_image> >
- > readers;
+ <
+ mpl::pair<char const *, gp_image >,
+ mpl::pair<wchar_t const *, gp_image >,
+ mpl::pair<IStream , gp_image >,
+ mpl::pair<FILE , detail::input_FILE_for_IStream_extender <gp_image> >,
+ mpl::pair<memory_chunk_t , detail::memory_chunk_for_IStream_extender<gp_image> >
+ > readers;
typedef mpl::map4
- <
- mpl::pair<char const *, detail::gp_writer>,
- mpl::pair<wchar_t const *, detail::gp_writer>,
- mpl::pair<IStream &, detail::gp_writer>,
- mpl::pair<FILE &, detail::gp_writer>
- > writers;
+ <
+ mpl::pair<char const *, detail::gp_writer>,
+ mpl::pair<wchar_t const *, detail::gp_writer>,
+ mpl::pair<IStream , detail::gp_writer>,
+ mpl::pair<FILE , detail::gp_writer>
+ > writers;
typedef mpl::vector5_c<format_tag, bmp, gif, jpeg, png, tiff> supported_image_formats;
Modified: sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libjpeg_image.hpp 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
@@ -425,14 +425,14 @@
typedef mpl::map3
<
- mpl::pair<memory_chunk_t const &, detail::seekable_input_memory_range_extender<libjpeg_image> >,
- mpl::pair<FILE &, libjpeg_image >,
+ mpl::pair<memory_chunk_t , detail::seekable_input_memory_range_extender<libjpeg_image> >,
+ mpl::pair<FILE , libjpeg_image >,
mpl::pair<char const *, detail::input_c_str_for_mmap_extender <libjpeg_image> >
> readers;
typedef mpl::map2
<
- mpl::pair<FILE &, detail::libjpeg_writer>,
+ mpl::pair<FILE , detail::libjpeg_writer>,
mpl::pair<char const *, detail::libjpeg_writer>
> writers;
Modified: sandbox/gil/boost/gil/extension/io2/libpng_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libpng_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libpng_image.hpp 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
@@ -393,14 +393,14 @@
typedef mpl::map3
<
- mpl::pair<memory_chunk_t const &, detail::seekable_input_memory_range_extender<libpng_image> >,
- mpl::pair<FILE &, libpng_image >,
- mpl::pair<char const *, detail::input_c_str_for_mmap_extender <libpng_image> >
+ mpl::pair<memory_chunk_t , detail::seekable_input_memory_range_extender<libpng_image> >,
+ mpl::pair<FILE , libpng_image >,
+ mpl::pair<char const *, detail::input_c_str_for_mmap_extender <libpng_image> >
> readers;
typedef mpl::map2
<
- mpl::pair<FILE &, detail::libpng_writer_FILE >,
+ mpl::pair<FILE , detail::libpng_writer_FILE >,
mpl::pair<char const *, detail::output_c_str_for_c_file_extender<detail::libpng_writer_FILE> >
> writers;
Modified: sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
@@ -499,13 +499,13 @@
typedef mpl::map2
<
mpl::pair<char const *, libtiff_image>,
- mpl::pair<FILE &, libtiff_image>
+ mpl::pair<FILE , libtiff_image>
> readers;
typedef mpl::map2
<
mpl::pair<char const *, detail::libtiff_writer>,
- mpl::pair<FILE &, detail::libtiff_writer>
+ mpl::pair<FILE , detail::libtiff_writer>
> writers;
typedef mpl::vector1_c<format_tag, tiff> supported_image_formats;
Modified: sandbox/gil/boost/gil/extension/io2/wic_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/wic_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/wic_image.hpp 2010-12-08 04:50:29 EST (Wed, 08 Dec 2010)
@@ -315,16 +315,16 @@
mpl::pair<char const *, wic_image >,
mpl::pair<wchar_t const *, wic_image >,
mpl::pair<HANDLE , wic_image >,
- mpl::pair<IStream &, wic_image >,
- mpl::pair<FILE &, detail::input_FILE_for_IStream_extender <wic_image> >,
- mpl::pair<memory_chunk_t const &, detail::memory_chunk_for_IStream_extender<wic_image> >
+ mpl::pair<IStream , wic_image >,
+ mpl::pair<FILE , detail::input_FILE_for_IStream_extender <wic_image> >,
+ mpl::pair<memory_chunk_t , detail::memory_chunk_for_IStream_extender<wic_image> >
> readers;
typedef mpl::map3
<
- mpl::pair<char const *, detail::output_c_str_for_c_file_extender<detail::output_FILE_for_IStream_extender <detail::wic_writer> > >,
- mpl::pair<IStream &, detail::wic_writer >,
- mpl::pair<FILE &, detail::output_FILE_for_IStream_extender <detail::wic_writer> >
+ mpl::pair<char const *, detail::output_c_str_for_c_file_extender<detail::output_FILE_for_IStream_extender <detail::wic_writer> > >,
+ mpl::pair<IStream , detail::wic_writer >,
+ mpl::pair<FILE , detail::output_FILE_for_IStream_extender <detail::wic_writer> >
> writers;
typedef mpl::vector5_c<format_tag, bmp, gif, jpeg, png, tiff> supported_image_formats;