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

Split out the process for tiff, webp, and jpeg into their own util folders. Added the intial concepts for an image_view_any variant.

Browse source
This commit is contained in:
Blake Thompson 2015-01-08 16:55:51 -05:00
parent 472e41966d
commit 035557450d
19 changed files with 992 additions and 604 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/python/mapnik_image.cpp
View file

@ -83,7 +83,7 @@ PyObject* tostring2(image_32 const & im, std::string const& format)
(s.data(),s.size()); (s.data(),s.size());
} }
PyObject* tostring3(image_32 const & im, std::string const& format, mapnik::rgba_palette_ptr const& pal) PyObject* tostring3(image_32 const & im, std::string const& format, mapnik::rgba_palette const& pal)
{ {
std::string s = save_to_string(im, format, pal); std::string s = save_to_string(im, format, pal);
return return
@ -106,7 +106,7 @@ void save_to_file2(mapnik::image_32 const& im, std::string const& filename, std:
save_to_file(im,filename,type); save_to_file(im,filename,type);
} }
void save_to_file3(mapnik::image_32 const& im, std::string const& filename, std::string const& type, mapnik::rgba_palette_ptr const& pal) void save_to_file3(mapnik::image_32 const& im, std::string const& filename, std::string const& type, mapnik::rgba_palette const& pal)
{ {
save_to_file(im,filename,type,pal); save_to_file(im,filename,type,pal);
} }

4
bindings/python/mapnik_image_view.cpp
View file

@ -77,7 +77,7 @@ PyObject* view_tostring2(image_view<image_data_rgba8> const & view, std::string
(s.data(),s.size()); (s.data(),s.size());
} }
PyObject* view_tostring3(image_view<image_data_rgba8> const & view, std::string const& format, mapnik::rgba_palette_ptr const& pal) PyObject* view_tostring3(image_view<image_data_rgba8> const & view, std::string const& format, mapnik::rgba_palette const& pal)
{ {
std::string s = save_to_string(view, format, pal); std::string s = save_to_string(view, format, pal);
return return
@ -126,7 +126,7 @@ void save_view2(image_view<image_data_rgba8> const& view,
void save_view3(image_view<image_data_rgba8> const& view, void save_view3(image_view<image_data_rgba8> const& view,
std::string const& filename, std::string const& filename,
std::string const& type, std::string const& type,
mapnik::rgba_palette_ptr const& pal) mapnik::rgba_palette const& pal)
{ {
save_to_file(view,filename,type,pal); save_to_file(view,filename,type,pal);
} }

2
bindings/python/mapnik_palette.cpp
View file

@ -55,7 +55,7 @@ void export_palette ()
{ {
using namespace boost::python; using namespace boost::python;
class_<std::shared_ptr<mapnik::rgba_palette>, class_<mapnik::rgba_palette,
std::shared_ptr<mapnik::rgba_palette>, std::shared_ptr<mapnik::rgba_palette>,
boost::noncopyable >("Palette",no_init) boost::noncopyable >("Palette",no_init)
//, init<std::string,std::string>( //, init<std::string,std::string>(

9
include/mapnik/image_data_any.hpp
View file

@ -24,8 +24,6 @@
#define MAPNIK_IMAGE_DATA_ANY_HPP #define MAPNIK_IMAGE_DATA_ANY_HPP
#include <mapnik/image_data.hpp> #include <mapnik/image_data.hpp>
#include <mapnik/image_view.hpp>
#include <mapnik/graphics.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
namespace mapnik { namespace mapnik {
@ -42,12 +40,7 @@ using image_data_base = util::variant<image_data_null,
image_data_rgba8, image_data_rgba8,
image_data_gray8, image_data_gray8,
image_data_gray16, image_data_gray16,
image_data_gray32f, image_data_gray32f>;
image_32,
image_view<image_data_rgba8>,
image_view<image_data_gray8>,
image_view<image_data_gray16>,
image_view<image_data_gray32f>>;
namespace detail { namespace detail {

15
include/mapnik/image_scaling_traits.hpp
View file

@ -23,9 +23,6 @@
#ifndef MAPNIK_IMAGE_SCALING_TRAITS_HPP #ifndef MAPNIK_IMAGE_SCALING_TRAITS_HPP
#define MAPNIK_IMAGE_SCALING_TRAITS_HPP #define MAPNIK_IMAGE_SCALING_TRAITS_HPP
// mapnik
#include <mapnik/graphics.hpp>
// agg // agg
#include "agg_image_accessors.h" #include "agg_image_accessors.h"
#include "agg_pixfmt_rgba.h" #include "agg_pixfmt_rgba.h"
@ -52,18 +49,6 @@ struct agg_scaling_traits<image_data_rgba8>
}; };
template <>
struct agg_scaling_traits<image_32>
{
using pixfmt_pre = agg::pixfmt_rgba32_pre;
using color_type = agg::rgba8;
using interpolator_type = agg::span_interpolator_linear<>;
using img_src_type = agg::image_accessor_clone<pixfmt_pre>;
using span_image_filter = agg::span_image_filter_rgba_nn<img_src_type,interpolator_type>;
using span_image_resample_affine = agg::span_image_resample_rgba_affine<img_src_type>;
};
template <> template <>
struct agg_scaling_traits<image_data_gray8> struct agg_scaling_traits<image_data_gray8>
{ {

33
include/mapnik/image_util.hpp
View file

@ -46,7 +46,6 @@ namespace mapnik {
class Map; class Map;
class rgba_palette; class rgba_palette;
class image_32; class image_32;
typedef std::shared_ptr<rgba_palette> rgba_palette_ptr;
class ImageWriterException : public std::exception class ImageWriterException : public std::exception
{ {
@ -85,7 +84,7 @@ template <typename T>
MAPNIK_DECL void save_to_file(T const& image, MAPNIK_DECL void save_to_file(T const& image,
std::string const& filename, std::string const& filename,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette); rgba_palette const& palette);
// guess type from file extension // guess type from file extension
template <typename T> template <typename T>
@ -95,7 +94,7 @@ MAPNIK_DECL void save_to_file(T const& image,
template <typename T> template <typename T>
MAPNIK_DECL void save_to_file(T const& image, MAPNIK_DECL void save_to_file(T const& image,
std::string const& filename, std::string const& filename,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template <typename T> template <typename T>
MAPNIK_DECL std::string save_to_string(T const& image, MAPNIK_DECL std::string save_to_string(T const& image,
@ -104,7 +103,7 @@ MAPNIK_DECL std::string save_to_string(T const& image,
template <typename T> template <typename T>
MAPNIK_DECL std::string save_to_string(T const& image, MAPNIK_DECL std::string save_to_string(T const& image,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template <typename T> template <typename T>
MAPNIK_DECL void save_to_stream MAPNIK_DECL void save_to_stream
@ -112,7 +111,7 @@ MAPNIK_DECL void save_to_stream
T const& image, T const& image,
std::ostream & stream, std::ostream & stream,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette rgba_palette const& palette
); );
template <typename T> template <typename T>
@ -126,7 +125,7 @@ MAPNIK_DECL void save_to_stream
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,
rgba_palette_ptr const& palette); rgba_palette const& palette);
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)
template <typename T> template <typename T>
@ -225,7 +224,7 @@ MAPNIK_DECL void save_to_file (image_32 const& image,
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,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette); rgba_palette const& palette);
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -235,14 +234,14 @@ MAPNIK_DECL std::string save_to_string(image_32 const& image,
MAPNIK_DECL std::string save_to_string(image_32 const& image, MAPNIK_DECL std::string save_to_string(image_32 const& image,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette); rgba_palette const& palette);
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
MAPNIK_DECL void save_to_stream(image_32 const& image, MAPNIK_DECL void save_to_stream(image_32 const& image,
std::ostream & stream, std::ostream & stream,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette); rgba_palette const& palette);
MAPNIK_DECL void save_to_stream(image_32 const& image, MAPNIK_DECL void save_to_stream(image_32 const& image,
std::ostream & stream, std::ostream & stream,
@ -253,7 +252,7 @@ MAPNIK_DECL void save_to_stream(image_32 const& image,
extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&, extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&, extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
@ -261,7 +260,7 @@ extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8
extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&, extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&, extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&); std::string const&);
@ -270,7 +269,7 @@ extern template MAPNIK_DECL void save_to_file<image_data_rgba8>(image_data_rgba8
extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
@ -278,7 +277,7 @@ extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (im
extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&); std::string const&);
@ -288,21 +287,21 @@ extern template MAPNIK_DECL std::string save_to_string<image_data_rgba8>(image_d
extern template MAPNIK_DECL std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&, extern template MAPNIK_DECL std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
extern template MAPNIK_DECL std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&); std::string const&);
extern template MAPNIK_DECL std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, extern template MAPNIK_DECL std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
rgba_palette_ptr const&); rgba_palette const&);
#ifdef _MSC_VER #ifdef _MSC_VER
template MAPNIK_DECL void save_to_stream<image_data_rgba8>( template MAPNIK_DECL void save_to_stream<image_data_rgba8>(
image_data_rgba8 const& image, image_data_rgba8 const& image,
std::ostream & stream, std::ostream & stream,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette rgba_palette const& palette
); );
template MAPNIK_DECL void save_to_stream<image_data_rgba8>( template MAPNIK_DECL void save_to_stream<image_data_rgba8>(
@ -315,7 +314,7 @@ template MAPNIK_DECL void save_to_stream<image_view<image_data_rgba8> > (
image_view<image_data_rgba8> const& image, image_view<image_data_rgba8> const& image,
std::ostream & stream, std::ostream & stream,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette rgba_palette const& palette
); );
template MAPNIK_DECL void save_to_stream<image_view<image_data_rgba8> > ( template MAPNIK_DECL void save_to_stream<image_view<image_data_rgba8> > (

47
include/mapnik/image_util_jpeg.hpp Normal file
View file

@ -0,0 +1,47 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_IMAGE_UTIL_JPEG_HPP
#define MAPNIK_IMAGE_UTIL_JPEG_HPP
// mapnik
#include <mapnik/util/variant.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik {
struct jpeg_saver : public mapnik::util::static_visitor<>
{
jpeg_saver(std::ostream &, std::string &);
template <typename T>
void operator() (T const&) const;
private:
std::ostream & stream_;
std::string const& t_;
};
} // end ns
#endif // MAPNIK_IMAGE_UTIL_JPEG_HPP

16
include/mapnik/image_util_png.hpp
View file

@ -32,15 +32,25 @@
namespace mapnik { namespace mapnik {
struct png_saver : public mapnik::util::static_visitor<> struct png_saver_pal : public mapnik::util::static_visitor<>
{ {
png_saver(std::ostream &, std::string &, rgba_palette_ptr const& = nullptr); png_saver_pal(std::ostream &, std::string &, rgba_palette const&);
template <typename T>
void operator() (T const&) const;
private:
std::ostream & stream_;
std::string const& t_;
rgba_palette const& pal_;
};
struct png_saver : public mapnik::util::static_visitor<>
{
png_saver(std::ostream &, std::string &);
template <typename T> template <typename T>
void operator() (T const&) const; void operator() (T const&) const;
private: private:
std::ostream & stream_; std::ostream & stream_;
std::string const& t_; std::string const& t_;
rgba_palette_ptr const& pal_;
}; };
} // end ns } // end ns

47
include/mapnik/image_util_tiff.hpp Normal file
View file

@ -0,0 +1,47 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_IMAGE_UTIL_TIFF_HPP
#define MAPNIK_IMAGE_UTIL_TIFF_HPP
// mapnik
#include <mapnik/util/variant.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik {
struct tiff_saver : public mapnik::util::static_visitor<>
{
tiff_saver(std::ostream &, std::string &);
template <typename T>
void operator() (T const&) const;
private:
std::ostream & stream_;
std::string const& t_;
};
} // end ns
#endif // MAPNIK_IMAGE_UTIL_TIFF_HPP

47
include/mapnik/image_util_webp.hpp Normal file
View file

@ -0,0 +1,47 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_IMAGE_UTIL_WEBP_HPP
#define MAPNIK_IMAGE_UTIL_WEBP_HPP
// mapnik
#include <mapnik/util/variant.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik {
struct webp_saver : public mapnik::util::static_visitor<>
{
webp_saver(std::ostream &, std::string &);
template <typename T>
void operator() (T const&) const;
private:
std::ostream & stream_;
std::string const& t_;
};
} // end ns
#endif // MAPNIK_IMAGE_UTIL_WEBP_HPP

8
include/mapnik/image_view.hpp
View file

@ -133,6 +133,12 @@ private:
unsigned height_; unsigned height_;
T const& data_; T const& data_;
}; };
}
using image_view_rgba8 = image_view<image_data_rgba8>;
using image_view_gray8 = image_view<image_data_gray8>;
using image_view_gray16 = image_view<image_data_gray16>;
using image_view_gray32f = image_view<image_data_gray32f>;
} // end ns
#endif // MAPNIK_IMAGE_VIEW_HPP #endif // MAPNIK_IMAGE_VIEW_HPP

79
include/mapnik/image_view_any.hpp Normal file
View file

@ -0,0 +1,79 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_IMAGE_VIEW_ANY_HPP
#define MAPNIK_IMAGE_VIEW_ANY_HPP
#include <mapnik/image_view.hpp>
#include <mapnik/util/variant.hpp>
namespace mapnik {
using image_view_base = util::variant<image_view_rgba8,
image_view_gray8,
image_view_gray16,
image_view_gray32f>;
namespace detail {
struct get_view_width_visitor
{
template <typename T>
std::size_t operator()(T const& data) const
{
return data.width();
}
};
struct get_view_height_visitor
{
template <typename T>
std::size_t operator()(T const& data) const
{
return data.height();
}
};
} // namespace detail
struct image_view_any : image_view_base
{
image_view_any() = default;
template <typename T>
image_view_any(T && data) noexcept
: image_view_base(std::move(data)) {}
std::size_t width() const
{
return util::apply_visitor(detail::get_view_width_visitor(),*this);
}
std::size_t height() const
{
return util::apply_visitor(detail::get_view_height_visitor(),*this);
}
};
}
#endif // MAPNIK_IMAGE_VIEW_ANY_HPP

2
include/mapnik/palette.hpp
View file

@ -130,8 +130,6 @@ private:
std::vector<unsigned> alpha_pal_; std::vector<unsigned> alpha_pal_;
}; };
typedef std::shared_ptr<rgba_palette> rgba_palette_ptr;
} // namespace mapnik } // namespace mapnik
#endif // MAPNIK_PALETTE_HPP #endif // MAPNIK_PALETTE_HPP

16
include/mapnik/png_io.hpp
View file

@ -657,14 +657,14 @@ void save_as_png8_hex(T1 & file,
if (width + height > 3) // at least 3 pixels (hextree implementation requirement) if (width + height > 3) // at least 3 pixels (hextree implementation requirement)
{ {
// structure for color quantization // structure for color quantization
std::shared_ptr<hextree<mapnik::rgba>> tree = std::make_shared<hextree<mapnik::rgba>>(opts.colors); hextree<mapnik::rgba> tree(opts.colors);
if (opts.trans_mode >= 0) if (opts.trans_mode >= 0)
{ {
tree->setTransMode(opts.trans_mode); tree.setTransMode(opts.trans_mode);
} }
if (opts.gamma > 0) if (opts.gamma > 0)
{ {
tree->setGamma(opts.gamma); tree.setGamma(opts.gamma);
} }
for (unsigned y = 0; y < height; ++y) for (unsigned y = 0; y < height; ++y)
@ -673,13 +673,13 @@ void save_as_png8_hex(T1 & file,
for (unsigned x = 0; x < width; ++x) for (unsigned x = 0; x < width; ++x)
{ {
unsigned val = row[x]; unsigned val = row[x];
tree->insert(mapnik::rgba(U2RED(val), U2GREEN(val), U2BLUE(val), U2ALPHA(val))); tree.insert(mapnik::rgba(U2RED(val), U2GREEN(val), U2BLUE(val), U2ALPHA(val)));
} }
} }
//transparency values per palette index //transparency values per palette index
std::vector<mapnik::rgba> pal; std::vector<mapnik::rgba> pal;
tree->create_palette(pal); tree.create_palette(pal);
std::vector<mapnik::rgb> palette; std::vector<mapnik::rgb> palette;
std::vector<unsigned> alphaTable; std::vector<unsigned> alphaTable;
for (unsigned i=0; i<pal.size(); ++i) for (unsigned i=0; i<pal.size(); ++i)
@ -687,7 +687,7 @@ void save_as_png8_hex(T1 & file,
palette.push_back(rgb(pal[i].r, pal[i].g, pal[i].b)); palette.push_back(rgb(pal[i].r, pal[i].g, pal[i].b));
alphaTable.push_back(pal[i].a); alphaTable.push_back(pal[i].a);
} }
save_as_png8<T1, T2, std::shared_ptr<hextree<mapnik::rgba>> >(file, image, tree, palette, alphaTable, opts); save_as_png8<T1, T2, hextree<mapnik::rgba> >(file, image, tree, palette, alphaTable, opts);
} }
else else
{ {
@ -698,10 +698,10 @@ void save_as_png8_hex(T1 & file,
template <typename T1, typename T2> template <typename T1, typename T2>
void save_as_png8_pal(T1 & file, void save_as_png8_pal(T1 & file,
T2 const& image, T2 const& image,
rgba_palette_ptr const& pal, rgba_palette const& pal,
png_options const& opts) png_options const& opts)
{ {
save_as_png8<T1, T2, rgba_palette_ptr>(file, image, pal, pal->palette(), pal->alphaTable(), opts); save_as_png8<T1, T2, rgba_palette>(file, image, pal, pal.palette(), pal.alphaTable(), opts);
} }
} }

495
src/image_util.cpp
View file

@ -21,21 +21,13 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#if defined(HAVE_TIFF)
#include <mapnik/tiff_io.hpp>
#endif
#if defined(HAVE_JPEG)
#include <mapnik/jpeg_io.hpp>
#endif
#if defined(HAVE_WEBP)
#include <mapnik/webp_io.hpp>
#endif
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/image_util_jpeg.hpp>
#include <mapnik/image_util_png.hpp> #include <mapnik/image_util_png.hpp>
#include <mapnik/image_util_tiff.hpp>
#include <mapnik/image_util_webp.hpp>
#include <mapnik/image_data.hpp> #include <mapnik/image_data.hpp>
#include <mapnik/image_data_any.hpp>
#include <mapnik/graphics.hpp> #include <mapnik/graphics.hpp>
#include <mapnik/memory.hpp> #include <mapnik/memory.hpp>
#include <mapnik/image_view.hpp> #include <mapnik/image_view.hpp>
@ -75,7 +67,7 @@ namespace mapnik
template <typename T> template <typename T>
std::string save_to_string(T const& image, std::string save_to_string(T const& image,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette) rgba_palette const& palette)
{ {
std::ostringstream ss(std::ios::out|std::ios::binary); std::ostringstream ss(std::ios::out|std::ios::binary);
save_to_stream(image, ss, type, palette); save_to_stream(image, ss, type, palette);
@ -95,7 +87,7 @@ template <typename T>
void save_to_file(T const& image, void save_to_file(T const& image,
std::string const& filename, std::string const& filename,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette) rgba_palette const& palette)
{ {
std::ofstream file (filename.c_str(), std::ios::out| std::ios::trunc|std::ios::binary); std::ofstream file (filename.c_str(), std::ios::out| std::ios::trunc|std::ios::binary);
if (file) if (file)
@ -118,420 +110,11 @@ void save_to_file(T const& image,
else throw ImageWriterException("Could not write file to " + filename ); else throw ImageWriterException("Could not write file to " + filename );
} }
#if defined(HAVE_TIFF) template <>
void handle_tiff_options(std::string const& type, void save_to_stream<image_data_any>(image_data_any const& image,
tiff_config & config)
{
if (type == "tiff")
{
return;
}
if (type.length() > 4)
{
boost::char_separator<char> sep(":");
boost::tokenizer< boost::char_separator<char> > tokens(type, sep);
for (auto const& t : tokens)
{
if (t == "tiff")
{
continue;
}
else if (boost::algorithm::starts_with(t, "compression="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (val == "deflate")
{
config.compression = COMPRESSION_DEFLATE;
}
else if (val == "adobedeflate")
{
config.compression = COMPRESSION_ADOBE_DEFLATE;
}
else if (val == "lzw")
{
config.compression = COMPRESSION_LZW;
}
else if (val == "none")
{
config.compression = COMPRESSION_NONE;
}
else
{
throw ImageWriterException("invalid tiff compression: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "method="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (val == "scanline")
{
config.method = TIFF_WRITE_SCANLINE;
}
else if (val == "strip" || val == "stripped")
{
config.method = TIFF_WRITE_STRIPPED;
}
else if (val == "tiled")
{
config.method = TIFF_WRITE_TILED;
}
else
{
throw ImageWriterException("invalid tiff method: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "zlevel="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.zlevel) || config.zlevel < 0 || config.zlevel > 9)
{
throw ImageWriterException("invalid tiff zlevel: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "tile_height="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.tile_height) || config.tile_height < 0 )
{
throw ImageWriterException("invalid tiff tile_height: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "tile_width="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.tile_width) || config.tile_width < 0 )
{
throw ImageWriterException("invalid tiff tile_width: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "rows_per_strip="))
{
std::string val = t.substr(15);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.rows_per_strip) || config.rows_per_strip < 0 )
{
throw ImageWriterException("invalid tiff rows_per_strip: '" + val + "'");
}
}
}
else
{
throw ImageWriterException("unhandled tiff option: " + t);
}
}
}
}
#endif
#if defined(HAVE_WEBP)
void handle_webp_options(std::string const& type,
WebPConfig & config,
bool & alpha)
{
if (type == "webp")
{
return;
}
if (type.length() > 4){
boost::char_separator<char> sep(":");
boost::tokenizer< boost::char_separator<char> > tokens(type, sep);
for (auto const& t : tokens)
{
if (t == "webp")
{
continue;
}
else if (boost::algorithm::starts_with(t, "quality="))
{
std::string val = t.substr(8);
if (!val.empty())
{
double quality = 90;
if (!mapnik::util::string2double(val,quality) || quality < 0.0 || quality > 100.0)
{
throw ImageWriterException("invalid webp quality: '" + val + "'");
}
config.quality = static_cast<float>(quality);
}
}
else if (boost::algorithm::starts_with(t, "method="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.method) || config.method < 0 || config.method > 6)
{
throw ImageWriterException("invalid webp method: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "lossless="))
{
std::string val = t.substr(9);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.lossless) || config.lossless < 0 || config.lossless > 1)
{
throw ImageWriterException("invalid webp lossless: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the lossless flag)
#else
#warning "compiling against webp that does not support the lossless flag"
#endif
throw ImageWriterException("your webp version does not support the lossless option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "image_hint="))
{
std::string val = t.substr(11);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
int image_hint = 0;
if (!mapnik::util::string2int(val,image_hint) || image_hint < 0 || image_hint > 3)
{
throw ImageWriterException("invalid webp image_hint: '" + val + "'");
}
config.image_hint = static_cast<WebPImageHint>(image_hint);
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the image_hint flag)
#else
#warning "compiling against webp that does not support the image_hint flag"
#endif
throw ImageWriterException("your webp version does not support the image_hint option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "alpha="))
{
std::string val = t.substr(6);
if (!val.empty())
{
if (!mapnik::util::string2bool(val,alpha))
{
throw ImageWriterException("invalid webp alpha: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "target_size="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.target_size))
{
throw ImageWriterException("invalid webp target_size: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "target_psnr="))
{
std::string val = t.substr(12);
if (!val.empty())
{
double psnr = 0;
if (!mapnik::util::string2double(val,psnr))
{
throw ImageWriterException("invalid webp target_psnr: '" + val + "'");
}
config.target_PSNR = psnr;
}
}
else if (boost::algorithm::starts_with(t, "segments="))
{
std::string val = t.substr(9);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.segments))
{
throw ImageWriterException("invalid webp segments: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "sns_strength="))
{
std::string val = t.substr(13);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.sns_strength))
{
throw ImageWriterException("invalid webp sns_strength: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_strength="))
{
std::string val = t.substr(16);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_strength))
{
throw ImageWriterException("invalid webp filter_strength: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_sharpness="))
{
std::string val = t.substr(17);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_sharpness))
{
throw ImageWriterException("invalid webp filter_sharpness: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_type="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_type))
{
throw ImageWriterException("invalid webp filter_type: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "autofilter="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.autofilter))
{
throw ImageWriterException("invalid webp autofilter: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "alpha_compression="))
{
std::string val = t.substr(18);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.alpha_compression))
{
throw ImageWriterException("invalid webp alpha_compression: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "alpha_filtering="))
{
std::string val = t.substr(16);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_filtering))
{
throw ImageWriterException("invalid webp alpha_filtering: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the alpha_filtering flag)
#else
#warning "compiling against webp that does not support the alpha_filtering flag"
#endif
throw ImageWriterException("your webp version does not support the alpha_filtering option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "alpha_quality="))
{
std::string val = t.substr(14);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_quality))
{
throw ImageWriterException("invalid webp alpha_quality: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the alpha_quality flag)
#else
#warning "compiling against webp that does not support the alpha_quality flag"
#endif
throw ImageWriterException("your webp version does not support the alpha_quality option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "pass="))
{
std::string val = t.substr(5);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.pass))
{
throw ImageWriterException("invalid webp pass: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "preprocessing="))
{
std::string val = t.substr(14);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.preprocessing))
{
throw ImageWriterException("invalid webp preprocessing: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "partitions="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.partitions))
{
throw ImageWriterException("invalid webp partitions: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "partition_limit="))
{
std::string val = t.substr(16);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.partition_limit))
{
throw ImageWriterException("invalid webp partition_limit: '" + val + "'");
}
}
}
else
{
throw ImageWriterException("unhandled webp option: " + t);
}
}
}
}
#endif
void save_to_stream(image_data_any const& image,
std::ostream & stream, std::ostream & stream,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette) rgba_palette const& palette)
{ {
if (stream && image.width() > 0 && image.height() > 0) if (stream && image.width() > 0 && image.height() > 0)
{ {
@ -539,7 +122,7 @@ void save_to_stream(image_data_any const& image,
std::transform(t.begin(), t.end(), t.begin(), ::tolower); std::transform(t.begin(), t.end(), t.begin(), ::tolower);
if (t == "png" || boost::algorithm::starts_with(t, "png")) if (t == "png" || boost::algorithm::starts_with(t, "png"))
{ {
mapnik::util::apply_visitor(png_saver(stream, t, palette), image); mapnik::util::apply_visitor(png_saver_pal(stream, t, palette), image);
} }
else if (boost::algorithm::starts_with(t, "tif")) else if (boost::algorithm::starts_with(t, "tif"))
{ {
@ -564,51 +147,19 @@ void save_to_stream(image_data_any const& image,
std::transform(t.begin(), t.end(), t.begin(), ::tolower); std::transform(t.begin(), t.end(), t.begin(), ::tolower);
if (t == "png" || boost::algorithm::starts_with(t, "png")) if (t == "png" || boost::algorithm::starts_with(t, "png"))
{ {
mapnik::util::apply_visitor(png_saver(stream, t), image); util::apply_visitor(png_saver(stream, t), image);
} }
else if (boost::algorithm::starts_with(t, "tif")) else if (boost::algorithm::starts_with(t, "tif"))
{ {
#if defined(HAVE_TIFF) util::apply_visitor(tiff_saver(stream, t), image);
tiff_config config;
handle_tiff_options(t, config);
save_as_tiff(stream, image, config);
#else
throw ImageWriterException("tiff output is not enabled in your build of Mapnik");
#endif
} }
else if (boost::algorithm::starts_with(t, "jpeg")) else if (boost::algorithm::starts_with(t, "jpeg"))
{ {
#if defined(HAVE_JPEG) util::apply_visitor(jpeg_saver(stream, t), image);
int quality = 85;
std::string val = t.substr(4);
if (!val.empty())
{
if (!mapnik::util::string2int(val,quality) || quality < 0 || quality > 100)
{
throw ImageWriterException("invalid jpeg quality: '" + val + "'");
}
}
save_as_jpeg(stream, quality, image);
#else
throw ImageWriterException("jpeg output is not enabled in your build of Mapnik");
#endif
} }
else if (boost::algorithm::starts_with(t, "webp")) else if (boost::algorithm::starts_with(t, "webp"))
{ {
#if defined(HAVE_WEBP) util::apply_visitor(webp_saver(stream, t), image);
WebPConfig config;
// Default values set here will be lossless=0 and quality=75 (as least as of webp v0.3.1)
if (!WebPConfigInit(&config))
{
throw std::runtime_error("version mismatch");
}
// see for more details: https://github.com/mapnik/mapnik/wiki/Image-IO#webp-output-options
bool alpha = true;
handle_webp_options(t,config,alpha);
save_as_webp(stream,image,config,alpha);
#else
throw ImageWriterException("webp output is not enabled in your build of Mapnik");
#endif
} }
else throw ImageWriterException("unknown file type: " + type); else throw ImageWriterException("unknown file type: " + type);
} }
@ -627,7 +178,7 @@ void save_to_file(T const& image, std::string const& filename)
} }
template <typename T> template <typename T>
void save_to_file(T const& image, std::string const& filename, rgba_palette_ptr const& palette) void save_to_file(T const& image, std::string const& filename, rgba_palette const& palette)
{ {
boost::optional<std::string> type = type_from_filename(filename); boost::optional<std::string> type = type_from_filename(filename);
if (type) if (type)
@ -726,21 +277,21 @@ template void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
template void save_to_file<image_data_rgba8>(image_data_rgba8 const&, template void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template void save_to_file<image_data_rgba8>(image_data_rgba8 const&, template void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&); std::string const&);
template void save_to_file<image_data_rgba8>(image_data_rgba8 const&, template void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&, template std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&,
std::string const&); std::string const&);
template std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&, template std::string save_to_string<image_data_rgba8>(image_data_rgba8 const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
@ -749,21 +300,21 @@ template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data
template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&); std::string const&);
template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template void save_to_file<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
template std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&); std::string const&);
template std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&, template std::string save_to_string<image_view<image_data_rgba8> > (image_view<image_data_rgba8> const&,
std::string const&, std::string const&,
rgba_palette_ptr const& palette); rgba_palette const& palette);
void save_to_file(image_32 const& image,std::string const& file) void save_to_file(image_32 const& image,std::string const& file)
{ {
@ -780,7 +331,7 @@ void save_to_file (image_32 const& image,
void save_to_file (image_32 const& image, void save_to_file (image_32 const& image,
std::string const& file, std::string const& file,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette) rgba_palette const& palette)
{ {
save_to_file<image_data_rgba8>(image.data(), file, type, palette); save_to_file<image_data_rgba8>(image.data(), file, type, palette);
} }
@ -793,7 +344,7 @@ std::string save_to_string(image_32 const& image,
std::string save_to_string(image_32 const& image, std::string save_to_string(image_32 const& image,
std::string const& type, std::string const& type,
rgba_palette_ptr const& palette) rgba_palette const& palette)
{ {
return save_to_string<image_data_rgba8>(image.data(), type, palette); return save_to_string<image_data_rgba8>(image.data(), type, palette);
} }

77
src/image_util_jpeg.cpp Normal file
View file

@ -0,0 +1,77 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
// mapnik
#if defined(HAVE_JPEG)
#include <mapnik/jpeg_io.hpp>
#endif
#include <mapnik/image_util_jpeg.hpp>
#include <mapnik/image_data.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik
{
jpeg_saver::jpeg_saver(std::ostream & stream, std::string const& t):
stream_(stream), t_(t) {}
void jpeg_saver::operator() (image_data_null const& image) const
{
throw ImageWriterException("null images not supported");
}
template <typename T>
void jpeg_saver::operator() (T const& image) const
{
#if defined(HAVE_JPEG)
int quality = 85;
std::string val = t.substr(4);
if (!val.empty())
{
if (!mapnik::util::string2int(val,quality) || quality < 0 || quality > 100)
{
throw ImageWriterException("invalid jpeg quality: '" + val + "'");
}
}
save_as_jpeg(stream, quality, image);
#else
throw ImageWriterException("jpeg output is not enabled in your build of Mapnik");
#endif
}
template void jpeg_saver::operator()<image_data_rgba8> (image_data_rgba8 const& image) const;
template void jpeg_saver::operator()<image_data_gray8> (image_data_gray8 const& image) const;
template void jpeg_saver::operator()<image_data_gray16> (image_data_gray16 const& image) const;
template void jpeg_saver::operator()<image_data_gray32f> (image_data_gray32f const& image) const;
template void jpeg_saver::operator()<image_view<image_data_rgba8>> (image_view<image_data_rgba8> const& image) const;
template void jpeg_saver::operator()<image_view<image_data_gray8>> (image_view<image_data_gray8> const& image) const;
template void jpeg_saver::operator()<image_view<image_data_gray16>> (image_view<image_data_gray16> const& image) const;
template void jpeg_saver::operator()<image_view<image_data_gray32f>> (image_view<image_data_gray32f> const& image) const;
} // end ns

138
src/image_util_png.cpp
View file

@ -173,7 +173,10 @@ void handle_png_options(std::string const& type,
} }
#endif #endif
png_saver::png_saver(std::ostream & stream, std::string const& t, rgba_palette_ptr const& pal): png_saver::png_saver(std::ostream & stream, std::string const& t):
stream_(stream), t_(t) {}
png_saver_pal::png_saver_pal(std::ostream & stream, std::string const& t, rgba_palette const& pal):
stream_(stream), t_(t), pal_(pal) {} stream_(stream), t_(t), pal_(pal) {}
void png_saver::operator() (image_data_null const& image) const void png_saver::operator() (image_data_null const& image) const
@ -181,7 +184,8 @@ void png_saver::operator() (image_data_null const& image) const
throw ImageWriterException("null images not supported"); throw ImageWriterException("null images not supported");
} }
void png_saver::operator() (image_data_rgba8 const& image) const template <typename T>
void process_rgb8_png_pal(T const& image)
{ {
#if defined(HAVE_PNG) #if defined(HAVE_PNG)
png_options opts; png_options opts;
@ -212,38 +216,54 @@ void png_saver::operator() (image_data_rgba8 const& image) const
#endif #endif
} }
template <typename T>
void process_rgb8_png(T const& image)
{
#if defined(HAVE_PNG)
png_options opts;
handle_png_options(t_, opts);
if (opts.paletted)
{
if (opts.use_hextree)
{
save_as_png8_hex(stream_, image, opts);
}
else
{
save_as_png8_oct(stream_, image, opts);
}
}
else
{
save_as_png(stream_, image, opts);
}
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
}
void png_saver_pal::operator() (image_data_rgba8 const& image) const
{
process_rgb8_png(image);
}
void png_saver_pal::operator() (image_view<image_data_rgba8> const& image) const
{
process_rgb8_png(image);
}
void png_saver::operator() (image_data_rgba8 const& image) const
{
process_rgb8_png(image);
}
void png_saver::operator() (image_view<image_data_rgba8> const& image) const void png_saver::operator() (image_view<image_data_rgba8> const& image) const
{ {
#if defined(HAVE_PNG) process_rgb8_png(image);
png_options opts;
handle_png_options(t_, opts);
if (pal_ && pal_->valid())
{
png_options opts;
handle_png_options(t,opts);
save_as_png8_pal(stream, image, pal_, opts);
}
else if (opts.paletted)
{
if (opts.use_hextree)
{
save_as_png8_hex(stream_, image, opts);
}
else
{
save_as_png8_oct(stream_, image, opts);
}
}
else
{
save_as_png(stream_, image, opts);
}
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
} }
void png_saver::operator() (image_data_gray8 const& image) const template <typename T>
void png_saver::operator() (T const& image) const
{ {
#if defined(HAVE_PNG) #if defined(HAVE_PNG)
png_options opts; png_options opts;
@ -254,7 +274,15 @@ void png_saver::operator() (image_data_gray8 const& image) const
#endif #endif
} }
void png_saver::operator() (image_view<image_data_gray8> const& image) const template void png_saver::operator()<image_data_gray8> (image_data_gray8 const& image) const;
template void png_saver::operator()<image_data_gray16> (image_data_gray16 const& image) const;
template void png_saver::operator()<image_data_gray32f> (image_data_gray32f const& image) const;
template void png_saver::operator()<image_view<image_data_gray8>> (image_view<image_data_gray8> const& image) const;
template void png_saver::operator()<image_view<image_data_gray16>> (image_view<image_data_gray16> const& image) const;
template void png_saver::operator()<image_view<image_data_gray32f>> (image_view<image_data_gray32f> const& image) const;
template <typename T>
void png_saver_pal::operator() (T const& image) const
{ {
#if defined(HAVE_PNG) #if defined(HAVE_PNG)
png_options opts; png_options opts;
@ -265,47 +293,11 @@ void png_saver::operator() (image_view<image_data_gray8> const& image) const
#endif #endif
} }
void png_saver::operator() (image_data_gray16 const& image) const template void png_saver_pal::operator()<image_data_gray8> (image_data_gray8 const& image) const;
{ template void png_saver_pal::operator()<image_data_gray16> (image_data_gray16 const& image) const;
#if defined(HAVE_PNG) template void png_saver_pal::operator()<image_data_gray32f> (image_data_gray32f const& image) const;
png_options opts; template void png_saver_pal::operator()<image_view<image_data_gray8>> (image_view<image_data_gray8> const& image) const;
handle_png_options(t_, opts); template void png_saver_pal::operator()<image_view<image_data_gray16>> (image_view<image_data_gray16> const& image) const;
save_as_png(stream_, image, opts); template void png_saver_pal::operator()<image_view<image_data_gray32f>> (image_view<image_data_gray32f> const& image) const;
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
}
void png_saver::operator() (image_view<image_data_gray16> const& image) const
{
#if defined(HAVE_PNG)
png_options opts;
handle_png_options(t_, opts);
save_as_png(stream_, image, opts);
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
}
void png_saver::operator() (mapnik::image_data_gray32f const& image) const
{
#if defined(HAVE_PNG)
png_options opts;
handle_png_options(t_, opts);
save_as_png(stream_, image, opts);
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
}
void png_saver::operator() (mapnik::image_data_gray32f const& image) const
{
#if defined(HAVE_PNG)
png_options opts;
handle_png_options(t_, opts);
save_as_png(stream_, image, opts);
#else
throw ImageWriterException("png output is not enabled in your build of Mapnik");
#endif
}
} // end ns } // end ns

191
src/image_util_tiff.cpp Normal file
View file

@ -0,0 +1,191 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
// mapnik
#if defined(HAVE_TIFF)
#include <mapnik/tiff_io.hpp>
#endif
#include <mapnik/image_util_tiff.hpp>
#include <mapnik/image_data.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik
{
#if defined(HAVE_TIFF)
void handle_tiff_options(std::string const& type,
tiff_config & config)
{
if (type == "tiff")
{
return;
}
if (type.length() > 4)
{
boost::char_separator<char> sep(":");
boost::tokenizer< boost::char_separator<char> > tokens(type, sep);
for (auto const& t : tokens)
{
if (t == "tiff")
{
continue;
}
else if (boost::algorithm::starts_with(t, "compression="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (val == "deflate")
{
config.compression = COMPRESSION_DEFLATE;
}
else if (val == "adobedeflate")
{
config.compression = COMPRESSION_ADOBE_DEFLATE;
}
else if (val == "lzw")
{
config.compression = COMPRESSION_LZW;
}
else if (val == "none")
{
config.compression = COMPRESSION_NONE;
}
else
{
throw ImageWriterException("invalid tiff compression: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "method="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (val == "scanline")
{
config.method = TIFF_WRITE_SCANLINE;
}
else if (val == "strip" || val == "stripped")
{
config.method = TIFF_WRITE_STRIPPED;
}
else if (val == "tiled")
{
config.method = TIFF_WRITE_TILED;
}
else
{
throw ImageWriterException("invalid tiff method: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "zlevel="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.zlevel) || config.zlevel < 0 || config.zlevel > 9)
{
throw ImageWriterException("invalid tiff zlevel: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "tile_height="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.tile_height) || config.tile_height < 0 )
{
throw ImageWriterException("invalid tiff tile_height: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "tile_width="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.tile_width) || config.tile_width < 0 )
{
throw ImageWriterException("invalid tiff tile_width: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "rows_per_strip="))
{
std::string val = t.substr(15);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.rows_per_strip) || config.rows_per_strip < 0 )
{
throw ImageWriterException("invalid tiff rows_per_strip: '" + val + "'");
}
}
}
else
{
throw ImageWriterException("unhandled tiff option: " + t);
}
}
}
}
#endif
tiff_saver::tiff_saver(std::ostream & stream, std::string const& t):
stream_(stream), t_(t) {}
void tiff_saver::operator() (image_data_null const& image) const
{
throw ImageWriterException("null images not supported");
}
template <typename T>
void tiff_saver::operator() (T const& image) const
{
#if defined(HAVE_TIFF)
tiff_config opts;
handle_tiff_options(t_, opts);
save_as_tiff(stream_, image, opts);
#else
throw ImageWriterException("tiff output is not enabled in your build of Mapnik");
#endif
}
template void tiff_saver::operator()<image_data_rgba8> (image_data_rgba8 const& image) const;
template void tiff_saver::operator()<image_data_gray8> (image_data_gray8 const& image) const;
template void tiff_saver::operator()<image_data_gray16> (image_data_gray16 const& image) const;
template void tiff_saver::operator()<image_data_gray32f> (image_data_gray32f const& image) const;
template void tiff_saver::operator()<image_view<image_data_rgba8>> (image_view<image_data_rgba8> const& image) const;
template void tiff_saver::operator()<image_view<image_data_gray8>> (image_view<image_data_gray8> const& image) const;
template void tiff_saver::operator()<image_view<image_data_gray16>> (image_view<image_data_gray16> const& image) const;
template void tiff_saver::operator()<image_view<image_data_gray32f>> (image_view<image_data_gray32f> const& image) const;
} // end ns

366
src/image_util_webp.cpp Normal file
View file

@ -0,0 +1,366 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2014 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
// mapnik
#if defined(HAVE_WEBP)
#include <mapnik/webp_io.hpp>
#endif
#include <mapnik/image_util_webp.hpp>
#include <mapnik/image_data.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl
#include <string>
#include <iostream>
namespace mapnik
{
#if defined(HAVE_WEBP)
void handle_webp_options(std::string const& type,
WebPConfig & config,
bool & alpha)
{
if (type == "webp")
{
return;
}
if (type.length() > 4){
boost::char_separator<char> sep(":");
boost::tokenizer< boost::char_separator<char> > tokens(type, sep);
for (auto const& t : tokens)
{
if (t == "webp")
{
continue;
}
else if (boost::algorithm::starts_with(t, "quality="))
{
std::string val = t.substr(8);
if (!val.empty())
{
double quality = 90;
if (!mapnik::util::string2double(val,quality) || quality < 0.0 || quality > 100.0)
{
throw ImageWriterException("invalid webp quality: '" + val + "'");
}
config.quality = static_cast<float>(quality);
}
}
else if (boost::algorithm::starts_with(t, "method="))
{
std::string val = t.substr(7);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.method) || config.method < 0 || config.method > 6)
{
throw ImageWriterException("invalid webp method: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "lossless="))
{
std::string val = t.substr(9);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.lossless) || config.lossless < 0 || config.lossless > 1)
{
throw ImageWriterException("invalid webp lossless: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the lossless flag)
#else
#warning "compiling against webp that does not support the lossless flag"
#endif
throw ImageWriterException("your webp version does not support the lossless option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "image_hint="))
{
std::string val = t.substr(11);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
int image_hint = 0;
if (!mapnik::util::string2int(val,image_hint) || image_hint < 0 || image_hint > 3)
{
throw ImageWriterException("invalid webp image_hint: '" + val + "'");
}
config.image_hint = static_cast<WebPImageHint>(image_hint);
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the image_hint flag)
#else
#warning "compiling against webp that does not support the image_hint flag"
#endif
throw ImageWriterException("your webp version does not support the image_hint option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "alpha="))
{
std::string val = t.substr(6);
if (!val.empty())
{
if (!mapnik::util::string2bool(val,alpha))
{
throw ImageWriterException("invalid webp alpha: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "target_size="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.target_size))
{
throw ImageWriterException("invalid webp target_size: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "target_psnr="))
{
std::string val = t.substr(12);
if (!val.empty())
{
double psnr = 0;
if (!mapnik::util::string2double(val,psnr))
{
throw ImageWriterException("invalid webp target_psnr: '" + val + "'");
}
config.target_PSNR = psnr;
}
}
else if (boost::algorithm::starts_with(t, "segments="))
{
std::string val = t.substr(9);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.segments))
{
throw ImageWriterException("invalid webp segments: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "sns_strength="))
{
std::string val = t.substr(13);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.sns_strength))
{
throw ImageWriterException("invalid webp sns_strength: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_strength="))
{
std::string val = t.substr(16);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_strength))
{
throw ImageWriterException("invalid webp filter_strength: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_sharpness="))
{
std::string val = t.substr(17);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_sharpness))
{
throw ImageWriterException("invalid webp filter_sharpness: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "filter_type="))
{
std::string val = t.substr(12);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.filter_type))
{
throw ImageWriterException("invalid webp filter_type: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "autofilter="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.autofilter))
{
throw ImageWriterException("invalid webp autofilter: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "alpha_compression="))
{
std::string val = t.substr(18);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.alpha_compression))
{
throw ImageWriterException("invalid webp alpha_compression: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "alpha_filtering="))
{
std::string val = t.substr(16);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_filtering))
{
throw ImageWriterException("invalid webp alpha_filtering: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the alpha_filtering flag)
#else
#warning "compiling against webp that does not support the alpha_filtering flag"
#endif
throw ImageWriterException("your webp version does not support the alpha_filtering option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "alpha_quality="))
{
std::string val = t.substr(14);
if (!val.empty())
{
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_quality))
{
throw ImageWriterException("invalid webp alpha_quality: '" + val + "'");
}
#else
#ifdef _MSC_VER
#pragma NOTE(compiling against webp that does not support the alpha_quality flag)
#else
#warning "compiling against webp that does not support the alpha_quality flag"
#endif
throw ImageWriterException("your webp version does not support the alpha_quality option");
#endif
}
}
else if (boost::algorithm::starts_with(t, "pass="))
{
std::string val = t.substr(5);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.pass))
{
throw ImageWriterException("invalid webp pass: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "preprocessing="))
{
std::string val = t.substr(14);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.preprocessing))
{
throw ImageWriterException("invalid webp preprocessing: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "partitions="))
{
std::string val = t.substr(11);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.partitions))
{
throw ImageWriterException("invalid webp partitions: '" + val + "'");
}
}
}
else if (boost::algorithm::starts_with(t, "partition_limit="))
{
std::string val = t.substr(16);
if (!val.empty())
{
if (!mapnik::util::string2int(val,config.partition_limit))
{
throw ImageWriterException("invalid webp partition_limit: '" + val + "'");
}
}
}
else
{
throw ImageWriterException("unhandled webp option: " + t);
}
}
}
}
#endif
webp_saver::webp_saver(std::ostream & stream, std::string const& t):
stream_(stream), t_(t) {}
void webp_saver::operator() (image_data_null const& image) const
{
throw ImageWriterException("null images not supported");
}
template <typename T>
void webp_saver::operator() (T const& image) const
{
#if defined(HAVE_WEBP)
WebPConfig config;
// Default values set here will be lossless=0 and quality=75 (as least as of webp v0.3.1)
if (!WebPConfigInit(&config))
{
throw std::runtime_error("version mismatch");
}
// see for more details: https://github.com/mapnik/mapnik/wiki/Image-IO#webp-output-options
bool alpha = true;
handle_webp_options(t,config,alpha);
save_as_webp(stream,image,config,alpha);
#else
throw ImageWriterException("webp output is not enabled in your build of Mapnik");
#endif
}
template void webp_saver::operator()<image_data_rgba8> (image_data_rgba8 const& image) const;
template void webp_saver::operator()<image_data_gray8> (image_data_gray8 const& image) const;
template void webp_saver::operator()<image_data_gray16> (image_data_gray16 const& image) const;
template void webp_saver::operator()<image_data_gray32f> (image_data_gray32f const& image) const;
template void webp_saver::operator()<image_view<image_data_rgba8>> (image_view<image_data_rgba8> const& image) const;
template void webp_saver::operator()<image_view<image_data_gray8>> (image_view<image_data_gray8> const& image) const;
template void webp_saver::operator()<image_view<image_data_gray16>> (image_view<image_data_gray16> const& image) const;
template void webp_saver::operator()<image_view<image_data_gray32f>> (image_view<image_data_gray32f> const& image) const;
} // end ns