merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/samples/cpp/stitching.cpp
+++ b/samples/cpp/stitching.cpp
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])

    if (status != Stitcher::OK)
    {
-        cout << "Can't stitch images, error code = " << status << endl;
+        cout << "Can't stitch images, error code = " << int(status) << endl;
        return -1;
    }