From 655828bf82f64de8feb9364044c3c8c1bd974170 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sun, 18 Jul 2010 03:05:06 +0200 Subject: Fix type mismatch of std::min args in ColorMatrixMatrix constructor (bzr r9508.1.25) --- src/display/nr-filter-colormatrix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 const &values) { - unsigned limit = std::min(20ul, values.size()); + unsigned limit = std::min(static_cast(20), values.size()); for (unsigned i = 0; i < limit; ++i) { if (i % 5 == 4) { _v[i] = round(values[i]*255*255); -- cgit v1.2.3