From e7b214b6d2fea7dcac46be380afdf33ccb24f532 Mon Sep 17 00:00:00 2001 From: LeonidBeynenson Date: Thu, 21 Feb 2013 19:49:37 +0400 Subject: [PATCH] Removed urequired functions --- modules/core/include/opencv2/core/core.hpp | 4 ---- modules/core/src/algorithm.cpp | 21 +-------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp index 3bcef2a82..f0c0f0f1d 100644 --- a/modules/core/include/opencv2/core/core.hpp +++ b/modules/core/include/opencv2/core/core.hpp @@ -4340,8 +4340,6 @@ public: CV_WRAP Mat getMat(const string& name) const; CV_WRAP vector getMatVector(const string& name) const; CV_WRAP Ptr getAlgorithm(const string& name) const; - CV_WRAP float getFloat(const string& name) const; - CV_WRAP uint64 getUInt64(const string& name) const; void set(const string& name, int value); void set(const string& name, double value); @@ -4378,8 +4376,6 @@ public: void setMatVector(const char* name, const vector& value); void setAlgorithm(const char* name, const Ptr& value); template void setAlgorithm(const char* name, const Ptr<_Tp>& value); - void setFloat(const char* name, float value); - void setUInt64(const char* name, uint64 value); CV_WRAP string paramHelp(const string& name) const; int paramType(const char* name) const; diff --git a/modules/core/src/algorithm.cpp b/modules/core/src/algorithm.cpp index c502457fc..8d292a34d 100644 --- a/modules/core/src/algorithm.cpp +++ b/modules/core/src/algorithm.cpp @@ -322,16 +322,6 @@ void Algorithm::setAlgorithm(const char* parameter, const Ptr& value) info()->set(this, parameter, ParamType::type, &value); } -void Algorithm::setFloat(const char* parameter, float value) -{ - info()->set(this, parameter, ParamType::type, &value); -} - -void Algorithm::setUInt64(const char* parameter, uint64 value) -{ - info()->set(this, parameter, ParamType::type, &value); -} - @@ -370,15 +360,6 @@ Ptr Algorithm::getAlgorithm(const string& parameter) const return get(parameter); } -float Algorithm::getFloat(const string& parameter) const -{ - return get(parameter); -} -uint64 Algorithm::getUInt64(const string& parameter) const -{ - return get(parameter); -} - string Algorithm::paramHelp(const string& parameter) const { return info()->paramHelp(parameter.c_str()); @@ -452,7 +433,7 @@ void AlgorithmInfo::write(const Algorithm* algo, FileStorage& fs) const nestedAlgo->write(fs); } else if( p.type == Param::FLOAT) - cv::write(fs, pname, algo->getFloat(pname)); + cv::write(fs, pname, algo->getDouble(pname)); else if( p.type == Param::UNSIGNED_INT) cv::write(fs, pname, algo->getInt(pname));//TODO: implement cv::write(, , unsigned int) else if( p.type == Param::UINT64)