Merge pull request #975 from SpecLad:merge-2.4

2013-06-11 17:28:26 +04:00
parent 81c6b46fc6 3bfc69740b
commit 7c4e3715b3
31 changed files with 435 additions and 444 deletions
@@ -437,7 +437,7 @@ public:
        GpuMat dclassified(1, 1, CV_32S);
        cudaSafeCall( cudaMemcpy(dclassified.ptr(), &classified, sizeof(int), cudaMemcpyHostToDevice) );

-        PyrLavel level(0, 1.0f, image.size(), NxM, minObjectSize);
+        PyrLavel level(0, scaleFactor, image.size(), NxM, minObjectSize);

        while (level.isFeasible(maxObjectSize))
        {