refactored border interpolation in gpu module

modules/gpu/src/cuda/border_interpolate.hpp

@@ -28,7 +28,7 @@
 //     derived from this software without specific prior written permission.
 //
 // This software is provided by the copyright holders and contributors "as is" and
-// any express or bpied warranties, including, but not limited to, the bpied
+// any express or implied warranties, including, but not limited to, the implied
 // warranties of merchantability and fitness for a particular purpose are disclaimed.
 // In no event shall the Intel Corporation or contributors be liable for any direct,
 // indirect, incidental, special, exemplary, or consequential damages
@@ -40,6 +40,11 @@
 //
 //M*/
 
+#ifndef __OPENCV_GPU_BORDER_INTERPOLATE_HPP__
+#define __OPENCV_GPU_BORDER_INTERPOLATE_HPP__
+
+#include "../internal_common.hpp"
+
 namespace cv { namespace gpu {
 
     struct BrdReflect101 
@@ -169,4 +174,6 @@ namespace cv { namespace gpu {
         int step;
     };
 
-}}
+}}
+
+#endif

modules/gpu/src/cuda/cuda_shared.hpp

@@ -95,13 +95,6 @@ namespace cv
             cudaSafeCall( cudaUnbindTexture(tex) );
         }        
 
-        // Available GPU border interpolation modes (named as CPU 
-        // border interpolation modes)
-        enum 
-        {
-            BORDER_REFLECT101 = 0,
-            BORDER_REPLICATE
-        };
     }
 }
 

modules/gpu/src/cuda/imgproc.cu

@@ -42,7 +42,6 @@
 
 #include "cuda_shared.hpp"
 #include "border_interpolate.hpp"
-#include <stdio.h>
 
 using namespace cv::gpu;