summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-07-18 01:05:06 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-07-18 01:05:06 +0000
commit655828bf82f64de8feb9364044c3c8c1bd974170 (patch)
treecbbf992a76a1d7baead3b9776475e48664cb1a20 /src
parentComponent transfer filter (diff)
downloadinkscape-655828bf82f64de8feb9364044c3c8c1bd974170.tar.gz
inkscape-655828bf82f64de8feb9364044c3c8c1bd974170.zip
Fix type mismatch of std::min args in ColorMatrixMatrix constructor
(bzr r9508.1.25)
Diffstat (limited to 'src')
-rw-r--r--src/display/nr-filter-colormatrix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 94459e3aa..8b7956833 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -33,7 +33,7 @@ FilterColorMatrix::~FilterColorMatrix()
struct ColorMatrixMatrix {
ColorMatrixMatrix(std::vector<double> const &values) {
- unsigned limit = std::min(20ul, values.size());
+ unsigned limit = std::min(static_cast<size_t>(20), values.size());
for (unsigned i = 0; i < limit; ++i) {
if (i % 5 == 4) {
_v[i] = round(values[i]*255*255);