third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compatibility: keep Ptr<FileStorage> stubs till OpenCV 5.0

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-09 21:05:17 +00:00
parent 6a8c5a1d27
commit 6e3700593f
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core.hpp
View File

@ -3101,6 +3101,10 @@ public:
* @overload * @overload
*/ */
CV_WRAP void write(FileStorage& fs, const String& name) const; CV_WRAP void write(FileStorage& fs, const String& name) const;
#if CV_VERSION_MAJOR < 5
/** @deprecated */
void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
#endif
/** @brief Reads algorithm parameters from a file storage /** @brief Reads algorithm parameters from a file storage
*/ */

8
modules/core/src/algorithm.cpp
View File

@ -68,6 +68,14 @@ void Algorithm::write(FileStorage& fs, const String& name) const
fs << "}"; fs << "}";
} }
#if CV_VERSION_MAJOR < 5
void Algorithm::write(const Ptr<FileStorage>& fs, const String& name) const
{
CV_Assert(fs);
write(*fs, name);
}
#endif
void Algorithm::save(const String& filename) const void Algorithm::save(const String& filename) const
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();

6
modules/features2d/include/opencv2/features2d.hpp
View File

@ -213,6 +213,9 @@ public:
// see corresponding cv::Algorithm method // see corresponding cv::Algorithm method
CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); } CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); }
#if CV_VERSION_MAJOR < 5
inline void write(const Ptr<FileStorage>& fs, const String& name) const { CV_Assert(fs); Algorithm::write(*fs, name); }
#endif
}; };
/** Feature detectors in OpenCV have wrappers with a common interface that enables you to easily switch /** Feature detectors in OpenCV have wrappers with a common interface that enables you to easily switch
@ -1102,6 +1105,9 @@ public:
// see corresponding cv::Algorithm method // see corresponding cv::Algorithm method
CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); } CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); }
#if CV_VERSION_MAJOR < 5
inline void write(const Ptr<FileStorage>& fs, const String& name) const { CV_Assert(fs); Algorithm::write(*fs, name); }
#endif
protected: protected:
/** /**