From 2e33eddedf39220fbdcca6ce132f20cc22d97044 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Wed, 22 Jul 2020 13:42:57 +0200 Subject: [PATCH] better cv4 compat --- mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp b/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp index 8cc03e3..6adfdd2 100644 --- a/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp +++ b/mapproxy/src/mapproxy/generator/tms-raster-patchwork.cpp @@ -37,7 +37,6 @@ #include "imgproc/rastermask/cvmat.hpp" #include "imgproc/png.hpp" -#include "imgproc/cvcompat.hpp" #include "jsoncpp/json.hpp" #include "jsoncpp/as.hpp" @@ -137,7 +136,7 @@ cv::Mat TmsRasterPatchwork::generateTileImage(const vts::TileId &tileId) const }()); const auto label(boost::lexical_cast(tileId)); - const auto face(IMGPROC_FONT_HERSHEY(COMPLEX_SMALL)); + const auto face(cv::FONT_HERSHEY_COMPLEX_SMALL); const int thickness(1); int baseline; const auto size(cv::getTextSize(label, face, 1.0