generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

double to float cast warning fix

Browse Source
This commit is contained in:
Alexander Mordvintsev 2014-07-27 18:25:42 +04:00
parent 5f47f70183
commit 586ace1873
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/shape/include/opencv2/shape/hist_cost.hpp
View File

@ -73,7 +73,7 @@ public:
}; };
CV_EXPORTS_W Ptr<HistogramCostExtractor> 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 class CV_EXPORTS_W EMDHistogramCostExtractor : public HistogramCostExtractor
@ -84,20 +84,20 @@ public:
}; };
CV_EXPORTS_W Ptr<HistogramCostExtractor> 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 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 class CV_EXPORTS_W EMDL1HistogramCostExtractor : public HistogramCostExtractor
{}; {};
CV_EXPORTS_W Ptr<HistogramCostExtractor> CV_EXPORTS_W Ptr<HistogramCostExtractor>
createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2); createEMDL1HistogramCostExtractor(int nDummies=25, float defaultCost=0.2f);
} // cv } // cv
#endif #endif

4
modules/shape/include/opencv2/shape/shape_distance.hpp
View File

@ -116,7 +116,7 @@ public:
/* Complete constructor */ /* Complete constructor */
CV_EXPORTS_W Ptr<ShapeContextDistanceExtractor> CV_EXPORTS_W Ptr<ShapeContextDistanceExtractor>
createShapeContextDistanceExtractor(int nAngularBins=12, int nRadialBins=4, 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<HistogramCostExtractor> &comparer = createChiHistogramCostExtractor(),
const Ptr<ShapeTransformer> &transformer = createThinPlateSplineShapeTransformer()); const Ptr<ShapeTransformer> &transformer = createThinPlateSplineShapeTransformer());
@ -137,7 +137,7 @@ public:
}; };
/* Constructor */ /* 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 } // cv
#endif #endif