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

update remaining image writers to use image_options

Browse source
This commit is contained in:
artemp 2015-05-15 16:54:15 +01:00
parent 6960c85cd2
commit e892f752e9
3 changed files with 133 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/image_util_jpeg.cpp
View file

@ -29,11 +29,9 @@
#include <mapnik/image_util_jpeg.hpp> #include <mapnik/image_util_jpeg.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_view.hpp> #include <mapnik/image_view.hpp>
#include <mapnik/image_options.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl // stl
#include <string> #include <string>
@ -48,25 +46,20 @@ void process_rgba8_jpeg(T const& image, std::string const& type, std::ostream &
{ {
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)
int quality = 85; int quality = 85;
//std::string val = type.substr(4);
if (type != "jpeg") if (type != "jpeg")
{ {
boost::char_separator<char> sep(":"); for (auto const& kv : parse_image_options(type))
boost::tokenizer< boost::char_separator<char> > tokens(type, sep);
for (auto const& t : tokens)
{ {
if (t == "jpeg") auto const& key = kv.first;
auto const& val = kv.second;
if ( key == "quality")
{ {
continue; if (val && ! (*val).empty())
}
else if (boost::algorithm::starts_with(t, "quality="))
{
std::string val = t.substr(8);
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,quality) || quality < 0 || quality > 100) if (!mapnik::util::string2int(*val, quality) || quality < 0 || quality > 100)
{ {
throw image_writer_exception("invalid jpeg quality: '" + val + "'"); throw image_writer_exception("invalid jpeg quality: '" + *val + "'");
} }
} }
} }

82
src/image_util_tiff.cpp
View file

@ -29,11 +29,9 @@
#include <mapnik/image_util_tiff.hpp> #include <mapnik/image_util_tiff.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_view.hpp> #include <mapnik/image_view.hpp>
#include <mapnik/image_options.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl // stl
#include <string> #include <string>
@ -50,111 +48,103 @@ void handle_tiff_options(std::string const& type,
} }
if (type.length() > 4) if (type.length() > 4)
{ {
boost::char_separator<char> sep(":");
boost::tokenizer< boost::char_separator<char> > tokens(type, sep); for (auto const& kv : parse_image_options(type))
for (auto const& t : tokens)
{ {
if (t == "tiff") auto const& key = kv.first;
auto const& val = kv.second;
if (key == "compression")
{ {
continue; if (val && !(*val).empty())
}
else if (boost::algorithm::starts_with(t, "compression="))
{
std::string val = t.substr(12);
if (!val.empty())
{ {
if (val == "deflate") if (*val == "deflate")
{ {
config.compression = COMPRESSION_DEFLATE; config.compression = COMPRESSION_DEFLATE;
} }
else if (val == "adobedeflate") else if (*val == "adobedeflate")
{ {
config.compression = COMPRESSION_ADOBE_DEFLATE; config.compression = COMPRESSION_ADOBE_DEFLATE;
} }
else if (val == "lzw") else if (*val == "lzw")
{ {
config.compression = COMPRESSION_LZW; config.compression = COMPRESSION_LZW;
} }
else if (val == "none") else if (*val == "none")
{ {
config.compression = COMPRESSION_NONE; config.compression = COMPRESSION_NONE;
} }
else else
{ {
throw image_writer_exception("invalid tiff compression: '" + val + "'"); throw image_writer_exception("invalid tiff compression: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "method=")) else if (key == "method")
{ {
std::string val = t.substr(7); if (val && !(*val).empty())
if (!val.empty())
{ {
if (val == "scanline") if (*val == "scanline")
{ {
config.method = TIFF_WRITE_SCANLINE; config.method = TIFF_WRITE_SCANLINE;
} }
else if (val == "strip" || val == "stripped") else if (*val == "strip" || *val == "stripped")
{ {
config.method = TIFF_WRITE_STRIPPED; config.method = TIFF_WRITE_STRIPPED;
} }
else if (val == "tiled") else if (*val == "tiled")
{ {
config.method = TIFF_WRITE_TILED; config.method = TIFF_WRITE_TILED;
} }
else else
{ {
throw image_writer_exception("invalid tiff method: '" + val + "'"); throw image_writer_exception("invalid tiff method: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "zlevel=")) else if (key == "zlevel")
{ {
std::string val = t.substr(7); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.zlevel) || config.zlevel < 0 || config.zlevel > 9) if (!mapnik::util::string2int(*val,config.zlevel) || config.zlevel < 0 || config.zlevel > 9)
{ {
throw image_writer_exception("invalid tiff zlevel: '" + val + "'"); throw image_writer_exception("invalid tiff zlevel: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "tile_height=")) else if (key == "tile_height")
{ {
std::string val = t.substr(12); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.tile_height) || config.tile_height < 0 ) if (!mapnik::util::string2int(*val,config.tile_height) || config.tile_height < 0 )
{ {
throw image_writer_exception("invalid tiff tile_height: '" + val + "'"); throw image_writer_exception("invalid tiff tile_height: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "tile_width=")) else if (key == "tile_width")
{ {
std::string val = t.substr(11); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.tile_width) || config.tile_width < 0 ) if (!mapnik::util::string2int(*val,config.tile_width) || config.tile_width < 0 )
{ {
throw image_writer_exception("invalid tiff tile_width: '" + val + "'"); throw image_writer_exception("invalid tiff tile_width: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "rows_per_strip=")) else if (key == "rows_per_strip")
{ {
std::string val = t.substr(15); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.rows_per_strip) || config.rows_per_strip < 0 ) if (!mapnik::util::string2int(*val,config.rows_per_strip) || config.rows_per_strip < 0 )
{ {
throw image_writer_exception("invalid tiff rows_per_strip: '" + val + "'"); throw image_writer_exception("invalid tiff rows_per_strip: '" + *val + "'");
} }
} }
} }
else else
{ {
throw image_writer_exception("unhandled tiff option: " + t); throw image_writer_exception("unhandled tiff option: " + key);
} }
} }
} }

200
src/image_util_webp.cpp
View file

@ -30,11 +30,9 @@
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_any.hpp> #include <mapnik/image_any.hpp>
#include <mapnik/image_view.hpp> #include <mapnik/image_view.hpp>
#include <mapnik/image_options.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
// boost
#include <boost/tokenizer.hpp>
// stl // stl
#include <string> #include <string>
#include <iostream> #include <iostream>
@ -51,48 +49,43 @@ void handle_webp_options(std::string const& type,
{ {
return; return;
} }
if (type.length() > 4){ if (type.length() > 4)
boost::char_separator<char> sep(":"); {
boost::tokenizer< boost::char_separator<char> > tokens(type, sep); for (auto const& kv : parse_image_options(type))
for (auto const& t : tokens)
{ {
if (t == "webp") auto const& key = kv.first;
auto const& val = kv.second;
if (key == "quality")
{ {
continue; if (val && !(*val).empty())
}
else if (boost::algorithm::starts_with(t, "quality="))
{
std::string val = t.substr(8);
if (!val.empty())
{ {
double quality = 90; double quality = 90;
if (!mapnik::util::string2double(val,quality) || quality < 0.0 || quality > 100.0) if (!mapnik::util::string2double(*val,quality) || quality < 0.0 || quality > 100.0)
{ {
throw image_writer_exception("invalid webp quality: '" + val + "'"); throw image_writer_exception("invalid webp quality: '" + *val + "'");
} }
config.quality = static_cast<float>(quality); config.quality = static_cast<float>(quality);
} }
} }
else if (boost::algorithm::starts_with(t, "method=")) else if (key == "method")
{ {
std::string val = t.substr(7); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.method) || config.method < 0 || config.method > 6) if (!mapnik::util::string2int(*val,config.method) || config.method < 0 || config.method > 6)
{ {
throw image_writer_exception("invalid webp method: '" + val + "'"); throw image_writer_exception("invalid webp method: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "lossless=")) else if (key == "lossless")
{ {
std::string val = t.substr(9); if (val && !(*val).empty())
if (!val.empty())
{ {
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100 #if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.lossless) || config.lossless < 0 || config.lossless > 1) if (!mapnik::util::string2int(*val,config.lossless) || config.lossless < 0 || config.lossless > 1)
{ {
throw image_writer_exception("invalid webp lossless: '" + val + "'"); throw image_writer_exception("invalid webp lossless: '" + *val + "'");
} }
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
@ -104,16 +97,15 @@ void handle_webp_options(std::string const& type,
#endif #endif
} }
} }
else if (boost::algorithm::starts_with(t, "image_hint=")) else if (key == "image_hint")
{ {
std::string val = t.substr(11); if (val && !(*val).empty())
if (!val.empty())
{ {
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100 #if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
int image_hint = 0; int image_hint = 0;
if (!mapnik::util::string2int(val,image_hint) || image_hint < 0 || image_hint > 3) if (!mapnik::util::string2int(*val,image_hint) || image_hint < 0 || image_hint > 3)
{ {
throw image_writer_exception("invalid webp image_hint: '" + val + "'"); throw image_writer_exception("invalid webp image_hint: '" + *val + "'");
} }
config.image_hint = static_cast<WebPImageHint>(image_hint); config.image_hint = static_cast<WebPImageHint>(image_hint);
#else #else
@ -126,127 +118,116 @@ void handle_webp_options(std::string const& type,
#endif #endif
} }
} }
else if (boost::algorithm::starts_with(t, "alpha=")) else if (key == "alpha")
{ {
std::string val = t.substr(6); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2bool(val,alpha)) if (!mapnik::util::string2bool(*val,alpha))
{ {
throw image_writer_exception("invalid webp alpha: '" + val + "'"); throw image_writer_exception("invalid webp alpha: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "target_size=")) else if (key == "target_size")
{ {
std::string val = t.substr(12); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.target_size)) if (!mapnik::util::string2int(*val,config.target_size))
{ {
throw image_writer_exception("invalid webp target_size: '" + val + "'"); throw image_writer_exception("invalid webp target_size: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "target_psnr=")) else if (key == "target_psnr")
{ {
std::string val = t.substr(12); if (val && !(*val).empty())
if (!val.empty())
{ {
double psnr = 0; double psnr = 0;
if (!mapnik::util::string2double(val,psnr)) if (!mapnik::util::string2double(*val,psnr))
{ {
throw image_writer_exception("invalid webp target_psnr: '" + val + "'"); throw image_writer_exception("invalid webp target_psnr: '" + *val + "'");
} }
config.target_PSNR = psnr; config.target_PSNR = psnr;
} }
} }
else if (boost::algorithm::starts_with(t, "segments=")) else if (key == "segments")
{ {
std::string val = t.substr(9); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.segments)) if (!mapnik::util::string2int(*val,config.segments))
{ {
throw image_writer_exception("invalid webp segments: '" + val + "'"); throw image_writer_exception("invalid webp segments: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "sns_strength=")) else if (key == "sns_strength")
{ {
std::string val = t.substr(13); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.sns_strength)) if (!mapnik::util::string2int(*val,config.sns_strength))
{ {
throw image_writer_exception("invalid webp sns_strength: '" + val + "'"); throw image_writer_exception("invalid webp sns_strength: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "filter_strength=")) else if (key == "filter_strength")
{ {
std::string val = t.substr(16); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.filter_strength)) if (!mapnik::util::string2int(*val,config.filter_strength))
{ {
throw image_writer_exception("invalid webp filter_strength: '" + val + "'"); throw image_writer_exception("invalid webp filter_strength: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "filter_sharpness=")) else if (key == "filter_sharpness")
{ {
std::string val = t.substr(17); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.filter_sharpness)) if (!mapnik::util::string2int(*val,config.filter_sharpness))
{ {
throw image_writer_exception("invalid webp filter_sharpness: '" + val + "'"); throw image_writer_exception("invalid webp filter_sharpness: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "filter_type=")) else if (key == "filter_type")
{ {
std::string val = t.substr(12); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.filter_type)) if (!mapnik::util::string2int(*val,config.filter_type))
{ {
throw image_writer_exception("invalid webp filter_type: '" + val + "'"); throw image_writer_exception("invalid webp filter_type: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "autofilter=")) else if (key == "autofilter")
{ {
std::string val = t.substr(11); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.autofilter)) if (!mapnik::util::string2int(*val,config.autofilter))
{ {
throw image_writer_exception("invalid webp autofilter: '" + val + "'"); throw image_writer_exception("invalid webp autofilter: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "alpha_compression=")) else if (key == "alpha_compression")
{ {
std::string val = t.substr(18); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.alpha_compression)) if (!mapnik::util::string2int(*val,config.alpha_compression))
{ {
throw image_writer_exception("invalid webp alpha_compression: '" + val + "'"); throw image_writer_exception("invalid webp alpha_compression: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "alpha_filtering=")) else if (key == "alpha_filtering")
{ {
std::string val = t.substr(16); if (val && !(*val).empty())
if (!val.empty())
{ {
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100 #if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_filtering)) if (!mapnik::util::string2int(*val,config.alpha_filtering))
{ {
throw image_writer_exception("invalid webp alpha_filtering: '" + val + "'"); throw image_writer_exception("invalid webp alpha_filtering: '" + *val + "'");
} }
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
@ -258,15 +239,14 @@ void handle_webp_options(std::string const& type,
#endif #endif
} }
} }
else if (boost::algorithm::starts_with(t, "alpha_quality=")) else if (key == "alpha_quality")
{ {
std::string val = t.substr(14); if (val && !(*val).empty())
if (!val.empty())
{ {
#if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100 #if (WEBP_ENCODER_ABI_VERSION >> 8) >= 1 // >= v0.1.99 / 0x0100
if (!mapnik::util::string2int(val,config.alpha_quality)) if (!mapnik::util::string2int(*val,config.alpha_quality))
{ {
throw image_writer_exception("invalid webp alpha_quality: '" + val + "'"); throw image_writer_exception("invalid webp alpha_quality: '" + *val + "'");
} }
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
@ -278,53 +258,49 @@ void handle_webp_options(std::string const& type,
#endif #endif
} }
} }
else if (boost::algorithm::starts_with(t, "pass=")) else if (key == "pass")
{ {
std::string val = t.substr(5); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.pass)) if (!mapnik::util::string2int(*val,config.pass))
{ {
throw image_writer_exception("invalid webp pass: '" + val + "'"); throw image_writer_exception("invalid webp pass: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "preprocessing=")) else if (key == "preprocessing")
{ {
std::string val = t.substr(14); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.preprocessing)) if (!mapnik::util::string2int(*val,config.preprocessing))
{ {
throw image_writer_exception("invalid webp preprocessing: '" + val + "'"); throw image_writer_exception("invalid webp preprocessing: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "partitions=")) else if (key == "partitions")
{ {
std::string val = t.substr(11); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.partitions)) if (!mapnik::util::string2int(*val,config.partitions))
{ {
throw image_writer_exception("invalid webp partitions: '" + val + "'"); throw image_writer_exception("invalid webp partitions: '" + *val + "'");
} }
} }
} }
else if (boost::algorithm::starts_with(t, "partition_limit=")) else if (key == "partition_limit")
{ {
std::string val = t.substr(16); if (val && !(*val).empty())
if (!val.empty())
{ {
if (!mapnik::util::string2int(val,config.partition_limit)) if (!mapnik::util::string2int(*val,config.partition_limit))
{ {
throw image_writer_exception("invalid webp partition_limit: '" + val + "'"); throw image_writer_exception("invalid webp partition_limit: '" + *val + "'");
} }
} }
} }
else else
{ {
throw image_writer_exception("unhandled webp option: " + t); throw image_writer_exception("unhandled webp option: " + key);
} }
} }
} }