update read/write methods

alalek · alalek · commit a8b70a5c97fb · 2017-11-23T19:12:26.000Z
diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp
@@ -3098,13 +3098,13 @@ class CV_EXPORTS_W Algorithm
      *
      * must rename it as it is overloaded in e.g Feature2D
      */
-    CV_WRAP_AS(write2) void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
+    CV_WRAP void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
 
     /** @brief Reads algorithm parameters from a file storage
      *
      * bindings: must rename it as it is overloaded in e.g Feature2D
      */
-    CV_WRAP_AS(read2) virtual void read(const FileNode& fn) { (void)fn; }
+    CV_WRAP virtual void read(const FileNode& fn) { (void)fn; }
 
     /** @brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read
      */
diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp
@@ -210,11 +210,15 @@ class CV_EXPORTS_W Feature2D : public virtual Algorithm
 
     virtual void write( FileStorage&) const;
 
-    virtual void read( const FileNode&);
+    // see corresponding cv::Algorithm method
+    CV_WRAP virtual void read( const FileNode&);
 
     //! Return true if detector object is empty
     CV_WRAP virtual bool empty() const;
     CV_WRAP virtual String getDefaultName() const;
+
+    // see corresponding cv::Algorithm method
+    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
 };
 
 /** Feature detectors in OpenCV have wrappers with a common interface that enables you to easily switch
@@ -985,7 +989,8 @@ class CV_EXPORTS_W DescriptorMatcher : public Algorithm
         read(fs.root());
     }
     // Reads matcher object from a file node
-    virtual void read( const FileNode& );
+    // see corresponding cv::Algorithm method
+    CV_WRAP virtual void read( const FileNode& );
     // Writes matcher object to a file storage
     virtual void write( FileStorage& ) const;
 
@@ -1012,6 +1017,10 @@ class CV_EXPORTS_W DescriptorMatcher : public Algorithm
 
     CV_WRAP static Ptr<DescriptorMatcher> create( int matcherType );
 
+
+    // see corresponding cv::Algorithm method
+    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
+
 protected:
     /**
      * Class to work with descriptors from several images as with one merged matrix.
diff --git a/modules/python/test/test_algorithm_rw.py b/modules/python/test/test_algorithm_rw.py
@@ -11,11 +11,11 @@ class algorithm_rw_test(NewOpenCVTests):
     def test_algorithm_rw(self):
         # some arbitrary non-default parameters
         gold = cv2.AKAZE_create(descriptor_size=1, descriptor_channels=2, nOctaves=3, threshold=4.0)
-        gold.write2(cv2.FileStorage("params.yml", 1), "AKAZE")
+        gold.write(cv2.FileStorage("params.yml", 1), "AKAZE")
 
         fs = cv2.FileStorage("params.yml", 0)
         algorithm = cv2.AKAZE_create()
-        algorithm.read2(fs.getNode("AKAZE"))
+        algorithm.read(fs.getNode("AKAZE"))
 
         self.assertEqual(algorithm.getDescriptorSize(), 1)
         self.assertEqual(algorithm.getDescriptorChannels(), 2)

Original file line number	Diff line number	Diff line change
`@@ -3098,13 +3098,13 @@ class CV_EXPORTS_W Algorithm`
`3098`	`3098`	`*`
`3099`	`3099`	`* must rename it as it is overloaded in e.g Feature2D`
`3100`	`3100`	`*/`
`3101`		`- CV_WRAP_AS(write2) void write(const Ptr<FileStorage>& fs, const String& name = String()) const;`
	`3101`	`+ CV_WRAP void write(const Ptr<FileStorage>& fs, const String& name = String()) const;`
`3102`	`3102`
`3103`	`3103`	`/** @brief Reads algorithm parameters from a file storage`
`3104`	`3104`	`*`
`3105`	`3105`	`* bindings: must rename it as it is overloaded in e.g Feature2D`
`3106`	`3106`	`*/`
`3107`		`- CV_WRAP_AS(read2) virtual void read(const FileNode& fn) { (void)fn; }`
	`3107`	`+ CV_WRAP virtual void read(const FileNode& fn) { (void)fn; }`
`3108`	`3108`
`3109`	`3109`	`/** @brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read`
`3110`	`3110`	`*/`