Merge pull request #2610 from kernelsanders/master

change config_error to std::runtime_error in scale_hsla struct
This commit is contained in:
Dane Springmeyer 2014-12-16 20:04:51 -08:00
commit 1b428f87fa

View file

@ -26,7 +26,6 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/color.hpp>
#include <mapnik/config_error.hpp>
#include <mapnik/util/variant.hpp>
// stl
@ -34,6 +33,7 @@
#include <ostream>
#include <iterator> // for std::back_insert_iterator
#include <functional> // std::ref
#include <exception>
namespace mapnik { namespace filter {
@ -101,7 +101,7 @@ struct scale_hsla : image_filter_base
a0 < 0 || a0 > 1 ||
a1 < 0 || a1 > 1)
{
throw config_error("scale-hsla values must be between 0 and 1");
throw std::runtime_error("scale-hsla values must be between 0 and 1");
}
}
inline bool is_identity() const {