double to float cast warning fix
authorAlexander Mordvintsev <zzznah@gmail.com>
Sun, 27 Jul 2014 14:25:42 +0000 (18:25 +0400)
committerAlexander Mordvintsev <zzznah@gmail.com>
Sun, 27 Jul 2014 14:25:42 +0000 (18:25 +0400)
modules/shape/include/opencv2/shape/hist_cost.hpp
modules/shape/include/opencv2/shape/shape_distance.hpp

index 9ca3825fdaf066e1e4733581ea885a5248f40c5a..0ff3573eea0ff43687863fbae466897f6f62ba96 100644 (file)
@@ -73,7 +73,7 @@ public:
 };
 
 CV_EXPORTS_W Ptr<HistogramCostExtractor>
-    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<HistogramCostExtractor>
-    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<HistogramCostExtractor> createChiHistogramCostExtractor(int nDummies=25, float defaultCost=0.2);
+CV_EXPORTS_W Ptr<HistogramCostExtractor> createChiHistogramCostExtractor(int nDummies=25, float defaultCost=0.2f);
 
 /*!  */
 class CV_EXPORTS_W EMDL1HistogramCostExtractor : public HistogramCostExtractor
 {};
 
 CV_EXPORTS_W Ptr<HistogramCostExtractor>
-    createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2);
+    createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2f);
 
 } // cv
 #endif
index 55e21aaa4a8c7d7fafc7fc1ee99b44f0fca7c0ab..acdb6e5f6e644f3beaf4de3d53dc9ac83110cd56 100644 (file)
@@ -116,7 +116,7 @@ public:
 /* Complete constructor */
 CV_EXPORTS_W Ptr<ShapeContextDistanceExtractor>
     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<HistogramCostExtractor> &comparer = createChiHistogramCostExtractor(),
                                         const Ptr<ShapeTransformer> &transformer = createThinPlateSplineShapeTransformer());
 
@@ -137,7 +137,7 @@ public:
 };
 
 /* Constructor */
-CV_EXPORTS_W Ptr<HausdorffDistanceExtractor> createHausdorffDistanceExtractor(int distanceFlag=cv::NORM_L2, float rankProp=0.6);
+CV_EXPORTS_W Ptr<HausdorffDistanceExtractor> createHausdorffDistanceExtractor(int distanceFlag=cv::NORM_L2, float rankProp=0.6f);
 
 } // cv
 #endif