Fixed parameter name and copy condition

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;
     }

modules/video/include/opencv2/video/tracking.hpp

@@ -304,7 +304,7 @@ enum
 };
 
 //! constructs a pyramid which can be used as input for calcOpticalFlowPyrLK
-CV_EXPORTS_W int buildOpticalFlowPyramid(InputArray _img, OutputArrayOfArrays pyramid,
+CV_EXPORTS_W int buildOpticalFlowPyramid(InputArray img, OutputArrayOfArrays pyramid,
                                          Size winSize, int maxLevel, bool withDerivatives = true,
                                          int pyrBorder = BORDER_REFLECT_101, int derivBorder = BORDER_CONSTANT,
                                          bool tryReuseInputImage = true);