propagated some fixes from 2.3 to trunk

2011-06-23 12:00:09 +00:00
parent d4fbb2c4fb
commit 49467947ac
26 changed files with 378 additions and 318 deletions
--- a/modules/python/test/test.py
+++ b/modules/python/test/test.py
@@ -2108,7 +2108,7 @@ class DocumentFragmentTests(OpenCVTests):

    def test_precornerdetect(self):
        from precornerdetect import precornerdetect
-        im = self.get_sample("samples/c/right01.jpg", 0)
+        im = self.get_sample("samples/cpp/right01.jpg", 0)
        imf = cv.CreateMat(im.rows, im.cols, cv.CV_32FC1)
        cv.ConvertScale(im, imf)
        (r0,r1) = precornerdetect(imf)