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

Updates to fix failing image options

Browse source
This commit is contained in:
Blake Thompson 2015-05-15 15:25:52 -05:00
parent 219ad1f2cc
commit 4fce3a7451
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/image_options.cpp
View file

@ -42,9 +42,9 @@ struct image_options_grammar
;
pair = key >> -('=' >> value)
;
key = char_("a-zA-Z_") >> *char_("a-zA-Z_0-9")
key = char_("a-zA-Z_") >> *char_("a-zA-Z_0-9\\.")
;
value = +char_("a-zA-Z_0-9")
value = +char_("a-zA-Z_0-9\\.")
;
}

2
src/image_util_jpeg.cpp
View file

@ -53,6 +53,8 @@ void process_rgba8_jpeg(T const& image, std::string const& type, std::ostream &
auto const& key = kv.first;
auto const& val = kv.second;
if ( key == "jpeg" ) continue;
if ( key == "quality")
{
if (val && ! (*val).empty())

2
src/image_util_tiff.cpp
View file

@ -53,7 +53,7 @@ void handle_tiff_options(std::string const& type,
{
auto const& key = kv.first;
auto const& val = kv.second;
if (key == "tiff") continue;
if (key == "compression")
{
if (val && !(*val).empty())

2
src/image_util_webp.cpp
View file

@ -56,6 +56,8 @@ void handle_webp_options(std::string const& type,
auto const& key = kv.first;
auto const& val = kv.second;
if (key == "webp") continue;
if (key == "quality")
{
if (val && !(*val).empty())