sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/romanustinov9/mapnik into romanustinov9-master

Browse source
This commit is contained in:
artemp 2014-07-01 14:03:31 +01:00
commit e052b6c6cf
1 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
include/mapnik/image_util.hpp
View file

@ -103,6 +103,23 @@ MAPNIK_DECL std::string save_to_string(T const& image,
std::string const& type, std::string const& type,
rgba_palette const& palette); rgba_palette const& palette);
template <typename T>
MAPNIK_DECL void save_to_stream
(
T const& image,
std::ostream & stream,
std::string const& type,
rgba_palette const& palette
);
template <typename T>
MAPNIK_DECL void save_to_stream
(
T const& image,
std::ostream & stream,
std::string const& type
);
template <typename T> template <typename T>
void save_as_png(T const& image, void save_as_png(T const& image,
std::string const& filename, std::string const& filename,
@ -203,7 +220,7 @@ void add_border(T & image)
/////////// save_to_file //////////////////////////////////////////////// /////////// save_to_file //////////////////////////////////////////////////
MAPNIK_DECL void save_to_file(image_32 const& image, MAPNIK_DECL void save_to_file(image_32 const& image,
std::string const& file); std::string const& file);
@ -217,7 +234,7 @@ MAPNIK_DECL void save_to_file (image_32 const& image,
std::string const& type, std::string const& type,
rgba_palette const& palette); rgba_palette const& palette);
////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
MAPNIK_DECL std::string save_to_string(image_32 const& image, MAPNIK_DECL std::string save_to_string(image_32 const& image,
@ -229,6 +246,17 @@ MAPNIK_DECL std::string save_to_string(image_32 const& image,
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
MAPNIK_DECL void save_to_stream(image_32 const& image,
std::ostream & stream,
std::string const& type,
rgba_palette const& palette);
MAPNIK_DECL void save_to_stream(image_32 const& image,
std::ostream & stream,
std::string const& type);
///////////////////////////////////////////////////////////////////////////
#ifdef _MSC_VER #ifdef _MSC_VER
template MAPNIK_DECL void save_to_file<image_data_32>(image_data_32 const&, template MAPNIK_DECL void save_to_file<image_data_32>(image_data_32 const&,
std::string const&, std::string const&,
@ -276,6 +304,32 @@ template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (ima
template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (image_view<image_data_32> const&, template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (image_view<image_data_32> const&,
std::string const&, std::string const&,
rgba_palette const&); rgba_palette const&);
template MAPNIK_DECL void save_to_stream<image_data_32>(
image_data_32 const& image,
std::ostream & stream,
std::string const& type,
rgba_palette const& palette
);
template MAPNIK_DECL void save_to_stream<image_data_32>(
image_data_32 const& image,
std::ostream & stream,
std::string const& type
);
template MAPNIK_DECL void save_to_stream<image_view<image_data_32> > (
image_view<image_data_32> const& image,
std::ostream & stream,
std::string const& type,
rgba_palette const& palette
);
template MAPNIK_DECL void save_to_stream<image_view<image_data_32> > (
image_view<image_data_32> const& image,
std::ostream & stream,
std::string const& type
);
#endif #endif
} }