Merged the trunk r8384:8407 (inclusive)

2012-05-30 08:04:37 +00:00
parent 72d2311edf
commit 7b5a45eac4
21 changed files with 1169 additions and 1169 deletions
--- a/modules/imgproc/src/utils.cpp
+++ b/modules/imgproc/src/utils.cpp
@@ -224,7 +224,7 @@ void cv::copyMakeBorder( InputArray _src, OutputArray _dst, int top, int bottom,

    if(top == 0 && left == 0 && bottom == 0 && right == 0)
    {
-        if(src.data != dst.data)
+        if(src.data != dst.data || src.step != dst.step)
            src.copyTo(dst);
        return;
    }