From 586ace1873fbf2f588b2edce29e6917c73c06e67 Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Sun, 27 Jul 2014 18:25:42 +0400 Subject: [PATCH] double to float cast warning fix --- modules/shape/include/opencv2/shape/hist_cost.hpp | 8 ++++---- modules/shape/include/opencv2/shape/shape_distance.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/shape/include/opencv2/shape/hist_cost.hpp b/modules/shape/include/opencv2/shape/hist_cost.hpp index 9ca3825fd..0ff3573ee 100644 --- a/modules/shape/include/opencv2/shape/hist_cost.hpp +++ b/modules/shape/include/opencv2/shape/hist_cost.hpp @@ -73,7 +73,7 @@ public: }; CV_EXPORTS_W Ptr - createNormHistogramCostExtractor(int flag=DIST_L2, int nDummies=25, float defaultCost=0.2); + createNormHistogramCostExtractor(int flag=DIST_L2, int nDummies=25, float defaultCost=0.2f); /*! */ class CV_EXPORTS_W EMDHistogramCostExtractor : public HistogramCostExtractor @@ -84,20 +84,20 @@ public: }; CV_EXPORTS_W Ptr - createEMDHistogramCostExtractor(int flag=DIST_L2, int nDummies=25, float defaultCost=0.2); + createEMDHistogramCostExtractor(int flag=DIST_L2, int nDummies=25, float defaultCost=0.2f); /*! */ class CV_EXPORTS_W ChiHistogramCostExtractor : public HistogramCostExtractor {}; -CV_EXPORTS_W Ptr createChiHistogramCostExtractor(int nDummies=25, float defaultCost=0.2); +CV_EXPORTS_W Ptr createChiHistogramCostExtractor(int nDummies=25, float defaultCost=0.2f); /*! */ class CV_EXPORTS_W EMDL1HistogramCostExtractor : public HistogramCostExtractor {}; CV_EXPORTS_W Ptr - createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2); + createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2f); } // cv #endif diff --git a/modules/shape/include/opencv2/shape/shape_distance.hpp b/modules/shape/include/opencv2/shape/shape_distance.hpp index 55e21aaa4..acdb6e5f6 100644 --- a/modules/shape/include/opencv2/shape/shape_distance.hpp +++ b/modules/shape/include/opencv2/shape/shape_distance.hpp @@ -116,7 +116,7 @@ public: /* Complete constructor */ CV_EXPORTS_W Ptr createShapeContextDistanceExtractor(int nAngularBins=12, int nRadialBins=4, - float innerRadius=0.2, float outerRadius=2, int iterations=3, + float innerRadius=0.2f, float outerRadius=2, int iterations=3, const Ptr &comparer = createChiHistogramCostExtractor(), const Ptr &transformer = createThinPlateSplineShapeTransformer()); @@ -137,7 +137,7 @@ public: }; /* Constructor */ -CV_EXPORTS_W Ptr createHausdorffDistanceExtractor(int distanceFlag=cv::NORM_L2, float rankProp=0.6); +CV_EXPORTS_W Ptr createHausdorffDistanceExtractor(int distanceFlag=cv::NORM_L2, float rankProp=0.6f); } // cv #endif