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

remove usage of boost::lexical_cast during image encoding - refs #1055

Browse source
This commit is contained in:
Dane Springmeyer 2012-02-08 15:45:08 -08:00
parent 16828ec161
commit fec0750fcf
1 changed files with 77 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
src/image_util.cpp
View file

@ -38,7 +38,7 @@ extern "C"
#include <mapnik/map.hpp> #include <mapnik/map.hpp>
// boost // boost
#include <boost/lexical_cast.hpp> #include <boost/spirit/include/qi.hpp>
// jpeg // jpeg
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)
@ -73,6 +73,8 @@ extern "C"
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
#include "agg_image_filters.h" #include "agg_image_filters.h"
using namespace boost::spirit;
namespace mapnik namespace mapnik
{ {
@ -156,85 +158,84 @@ void handle_png_options(std::string const& type,
{ {
*use_octree = true; *use_octree = true;
} }
else if (boost::algorithm::istarts_with(t,std::string("c="))) else if (boost::algorithm::istarts_with(t, "c="))
{ {
try if (*colors < 0)
throw ImageWriterException("invalid color parameter: unavailable for true color images");
std::string const& val = t.substr(2);
std::string::const_iterator str_beg = val.begin();
std::string::const_iterator str_end = val.end();
bool r = qi::phrase_parse(str_beg,str_end,qi::int_,ascii::space,*colors);
if (!r || (str_beg != str_end) || *colors < 0 || *colors > 256)
throw ImageWriterException("invalid color parameter: " + val);
}
else if (boost::algorithm::istarts_with(t, "t="))
{
if (*colors < 0)
throw ImageWriterException("invalid trans_mode parameter: unavailable for true color images");
std::string const& val = t.substr(2);
std::string::const_iterator str_beg = val.begin();
std::string::const_iterator str_end = val.end();
bool r = qi::phrase_parse(str_beg,str_end,qi::int_,ascii::space,*trans_mode);
if (!r || (str_beg != str_end) || *trans_mode < 0 || *trans_mode > 2)
throw ImageWriterException("invalid trans_mode parameter: " + val);
}
else if (boost::algorithm::istarts_with(t, "g="))
{
if (*colors < 0)
throw ImageWriterException("invalid gamma parameter: unavailable for true color images");
std::string const& val = t.substr(2);
std::string::const_iterator str_beg = val.begin();
std::string::const_iterator str_end = val.end();
bool r = qi::phrase_parse(str_beg,str_end,qi::double_,ascii::space,*gamma);
if (!r || (str_beg != str_end) || *gamma < 0)
{ {
if (*colors < 0) throw ImageWriterException("invalid gamma parameter: " + val);
throw ImageWriterException("invalid color parameter: unavailable for true color images");
*colors = boost::lexical_cast<int>(t.substr(2));
if (*colors < 0 || *colors > 256)
throw ImageWriterException("invalid color parameter: " + t.substr(2) + " out of bounds");
}
catch(boost::bad_lexical_cast &)
{
throw ImageWriterException("invalid color parameter: " + t.substr(2));
} }
} }
else if (boost::algorithm::istarts_with(t, std::string("t="))) else if (boost::algorithm::istarts_with(t, "z="))
{ {
try /*
#define Z_NO_COMPRESSION 0
#define Z_BEST_SPEED 1
#define Z_BEST_COMPRESSION 9
#define Z_DEFAULT_COMPRESSION (-1)
*/
std::string const& val = t.substr(2);
std::string::const_iterator str_beg = val.begin();
std::string::const_iterator str_end = val.end();
bool r = qi::phrase_parse(str_beg,str_end,qi::int_,ascii::space,*compression);
if (!r || (str_beg != str_end)
|| *compression < Z_DEFAULT_COMPRESSION
|| *compression > Z_BEST_COMPRESSION)
{ {
if (*colors < 0) throw ImageWriterException("invalid compression parameter: " + val + " (only -1 through 9 are valid)");
throw ImageWriterException("invalid trans_mode parameter: unavailable for true color images");
*trans_mode = boost::lexical_cast<int>(t.substr(2));
if (*trans_mode < 0 || *trans_mode > 2)
throw ImageWriterException("invalid trans_mode parameter: " + t.substr(2) + " out of bounds");
}
catch(boost::bad_lexical_cast &)
{
throw ImageWriterException("invalid trans_mode parameter: " + t.substr(2));
} }
} }
else if (boost::algorithm::istarts_with(t, std::string("g="))) else if (boost::algorithm::istarts_with(t, "s="))
{ {
try std::string const& s = t.substr(2);
if (s == "default")
{ {
if (*colors < 0) *strategy = Z_DEFAULT_STRATEGY;
throw ImageWriterException("invalid gamma parameter: unavailable for true color images");
*gamma = boost::lexical_cast<double>(t.substr(2));
if (*gamma < 0)
throw ImageWriterException("invalid gamma parameter: " + t.substr(2) + " out of bounds");
} }
catch(boost::bad_lexical_cast &) else if (s == "filtered")
{ {
throw ImageWriterException("invalid gamma parameter: " + t.substr(2)); *strategy = Z_FILTERED;
} }
} else if (s == "huff")
else if (boost::algorithm::istarts_with(t,std::string("z=")))
{
try
{ {
*compression = boost::lexical_cast<int>(t.substr(2)); *strategy = Z_HUFFMAN_ONLY;
/*
#define Z_NO_COMPRESSION 0
#define Z_BEST_SPEED 1
#define Z_BEST_COMPRESSION 9
#define Z_DEFAULT_COMPRESSION (-1)
*/
if (*compression < Z_DEFAULT_COMPRESSION || *compression > Z_BEST_COMPRESSION)
throw ImageWriterException("invalid compression parameter: " + t.substr(2) + " out of bounds (only -1 through 9 are valid)");
} }
catch(boost::bad_lexical_cast &) else if (s == "rle")
{ {
throw ImageWriterException("invalid compression parameter: " + t.substr(2)); *strategy = Z_RLE;
} }
} else
else if (boost::algorithm::istarts_with(t,std::string("s=")))
{
try
{ {
std::string s = boost::lexical_cast<std::string>(t.substr(2)); throw ImageWriterException("invalid compression strategy parameter: " + s);
if (s == "default") *strategy = Z_DEFAULT_STRATEGY;
else if (s == "filtered") *strategy = Z_FILTERED;
else if (s == "huff") *strategy = Z_HUFFMAN_ONLY;
else if (s == "rle") *strategy = Z_RLE;
else
throw ImageWriterException("invalid compression strategy parameter: " + s);
}
catch(boost::bad_lexical_cast &)
{
throw ImageWriterException("invalid compression strategy parameter: " + t.substr(2));
} }
} }
} }
@ -250,7 +251,7 @@ void save_to_stream(T const& image,
if (stream) if (stream)
{ {
//all this should go into image_writer factory //all this should go into image_writer factory
if (type == "png" || boost::algorithm::istarts_with(type, std::string("png"))) if (type == "png" || boost::algorithm::istarts_with(type, "png"))
{ {
int colors = 256; int colors = 256;
int compression = Z_DEFAULT_COMPRESSION; int compression = Z_DEFAULT_COMPRESSION;
@ -276,12 +277,12 @@ void save_to_stream(T const& image,
else else
save_as_png8_hex(stream, image, colors, compression, strategy, trans_mode, gamma); save_as_png8_hex(stream, image, colors, compression, strategy, trans_mode, gamma);
} }
else if (boost::algorithm::istarts_with(type, std::string("tif"))) else if (boost::algorithm::istarts_with(type, "tif"))
{ {
throw ImageWriterException("palettes are not currently supported when writing to tiff format (yet)"); throw ImageWriterException("palettes are not currently supported when writing to tiff format (yet)");
} }
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)
else if (boost::algorithm::istarts_with(type, std::string("jpeg"))) else if (boost::algorithm::istarts_with(type, "jpeg"))
{ {
throw ImageWriterException("palettes are not currently supported when writing to jpeg format"); throw ImageWriterException("palettes are not currently supported when writing to jpeg format");
} }
@ -300,7 +301,7 @@ void save_to_stream(T const& image,
if (stream) if (stream)
{ {
//all this should go into image_writer factory //all this should go into image_writer factory
if (type == "png" || boost::algorithm::istarts_with(type, std::string("png"))) if (type == "png" || boost::algorithm::istarts_with(type, "png"))
{ {
int colors = 256; int colors = 256;
int compression = Z_DEFAULT_COMPRESSION; int compression = Z_DEFAULT_COMPRESSION;
@ -324,28 +325,26 @@ void save_to_stream(T const& image,
else else
save_as_png8_hex(stream, image, colors, compression, strategy, trans_mode, gamma); save_as_png8_hex(stream, image, colors, compression, strategy, trans_mode, gamma);
} }
else if (boost::algorithm::istarts_with(type, std::string("tif"))) else if (boost::algorithm::istarts_with(type, "tif"))
{ {
save_as_tiff(stream, image); save_as_tiff(stream, image);
} }
#if defined(HAVE_JPEG) #if defined(HAVE_JPEG)
else if (boost::algorithm::istarts_with(type, std::string("jpeg"))) else if (boost::algorithm::istarts_with(type, "jpeg"))
{ {
int quality = 85; int quality = 85;
try std::string const& val = type.substr(4);
if(!val.empty())
{ {
if(type.substr(4).length() != 0) std::string::const_iterator str_beg = val.begin();
std::string::const_iterator str_end = val.end();
bool r = qi::phrase_parse(str_beg,str_end,qi::int_,ascii::space,quality);
if (!r || (str_beg != str_end) || quality < 0 || quality > 100)
{ {
quality = boost::lexical_cast<int>(type.substr(4)); throw ImageWriterException("invalid jpeg quality: " + val);
if(quality<0 || quality>100)
throw ImageWriterException("invalid jpeg quality: " + type.substr(4) + " out of bounds");
} }
save_as_jpeg(stream, quality, image);
}
catch(boost::bad_lexical_cast &)
{
throw ImageWriterException("invalid jpeg quality: " + type.substr(4) + " not a number");
} }
save_as_jpeg(stream, quality, image);
} }
#endif #endif
else throw ImageWriterException("unknown file type: " + type); else throw ImageWriterException("unknown file type: " + type);