replaced NCV_EXPORTS with CV_EXPORTS

modules/gpunvidia/include/opencv2/gpunvidia/NCV.hpp

@@ -43,11 +43,7 @@
 #ifndef _ncv_hpp_
 #define _ncv_hpp_
 
-#if (defined WIN32 || defined _WIN32 || defined WINCE) && defined CVAPI_EXPORTS
-    #define NCV_EXPORTS __declspec(dllexport)
-#else
-    #define NCV_EXPORTS
-#endif
+#include "opencv2/core/cvdef.h"
 
 #ifdef _WIN32
     #define WIN32_LEAN_AND_MEAN
@@ -244,13 +240,13 @@ const Ncv32u K_LOG2_WARP_SIZE = 5;
 //==============================================================================
 
 
-NCV_EXPORTS void ncvDebugOutput(const cv::String &msg);
+CV_EXPORTS void ncvDebugOutput(const cv::String &msg);
 
 
 typedef void NCVDebugOutputHandler(const cv::String &msg);
 
 
-NCV_EXPORTS void ncvSetDebugOutputHandler(NCVDebugOutputHandler* func);
+CV_EXPORTS void ncvSetDebugOutputHandler(NCVDebugOutputHandler* func);
 
 
 #define ncvAssertPrintCheck(pred, msg) \
@@ -401,11 +397,11 @@ typedef Ncv32u NCVStatus;
 
 typedef struct _NcvTimer *NcvTimer;
 
-NCV_EXPORTS NcvTimer ncvStartTimer(void);
+CV_EXPORTS NcvTimer ncvStartTimer(void);
 
-NCV_EXPORTS double ncvEndQueryTimerUs(NcvTimer t);
+CV_EXPORTS double ncvEndQueryTimerUs(NcvTimer t);
 
-NCV_EXPORTS double ncvEndQueryTimerMs(NcvTimer t);
+CV_EXPORTS double ncvEndQueryTimerMs(NcvTimer t);
 
 
 //==============================================================================
@@ -418,7 +414,7 @@ NCV_EXPORTS double ncvEndQueryTimerMs(NcvTimer t);
 /**
 * Calculates the aligned top bound value
 */
-NCV_EXPORTS Ncv32u alignUp(Ncv32u what, Ncv32u alignment);
+CV_EXPORTS Ncv32u alignUp(Ncv32u what, Ncv32u alignment);
 
 
 /**
@@ -436,7 +432,7 @@ enum NCVMemoryType
 /**
 * NCVMemPtr
 */
-struct NCV_EXPORTS NCVMemPtr
+struct CV_EXPORTS NCVMemPtr
 {
     void *ptr;
     NCVMemoryType memtype;
@@ -447,7 +443,7 @@ struct NCV_EXPORTS NCVMemPtr
 /**
 * NCVMemSegment
 */
-struct NCV_EXPORTS NCVMemSegment
+struct CV_EXPORTS NCVMemSegment
 {
     NCVMemPtr begin;
     size_t size;
@@ -458,7 +454,7 @@ struct NCV_EXPORTS NCVMemSegment
 /**
 * INCVMemAllocator (Interface)
 */
-class NCV_EXPORTS INCVMemAllocator
+class CV_EXPORTS INCVMemAllocator
 {
 public:
     virtual ~INCVMemAllocator() = 0;
@@ -480,7 +476,7 @@ inline INCVMemAllocator::~INCVMemAllocator() {}
 /**
 * NCVMemStackAllocator
 */
-class NCV_EXPORTS NCVMemStackAllocator : public INCVMemAllocator
+class CV_EXPORTS NCVMemStackAllocator : public INCVMemAllocator
 {
     NCVMemStackAllocator();
     NCVMemStackAllocator(const NCVMemStackAllocator &);
@@ -517,7 +513,7 @@ private:
 /**
 * NCVMemNativeAllocator
 */
-class NCV_EXPORTS NCVMemNativeAllocator : public INCVMemAllocator
+class CV_EXPORTS NCVMemNativeAllocator : public INCVMemAllocator
 {
 public:
 
@@ -549,12 +545,12 @@ private:
 /**
 * Copy dispatchers
 */
-NCV_EXPORTS NCVStatus memSegCopyHelper(void *dst, NCVMemoryType dstType,
+CV_EXPORTS NCVStatus memSegCopyHelper(void *dst, NCVMemoryType dstType,
                                        const void *src, NCVMemoryType srcType,
                                        size_t sz, cudaStream_t cuStream);
 
 
-NCV_EXPORTS NCVStatus memSegCopyHelper2D(void *dst, Ncv32u dstPitch, NCVMemoryType dstType,
+CV_EXPORTS NCVStatus memSegCopyHelper2D(void *dst, Ncv32u dstPitch, NCVMemoryType dstType,
                                          const void *src, Ncv32u srcPitch, NCVMemoryType srcType,
                                          Ncv32u widthbytes, Ncv32u height, cudaStream_t cuStream);
 
@@ -990,23 +986,23 @@ private:
 /**
 * Operations with rectangles
 */
-NCV_EXPORTS NCVStatus ncvGroupRectangles_host(NCVVector<NcvRect32u> &hypotheses, Ncv32u &numHypotheses,
+CV_EXPORTS NCVStatus ncvGroupRectangles_host(NCVVector<NcvRect32u> &hypotheses, Ncv32u &numHypotheses,
                                               Ncv32u minNeighbors, Ncv32f intersectEps, NCVVector<Ncv32u> *hypothesesWeights);
 
 
-NCV_EXPORTS NCVStatus ncvDrawRects_8u_host(Ncv8u *h_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
+CV_EXPORTS NCVStatus ncvDrawRects_8u_host(Ncv8u *h_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
                                            NcvRect32u *h_rects, Ncv32u numRects, Ncv8u color);
 
 
-NCV_EXPORTS NCVStatus ncvDrawRects_32u_host(Ncv32u *h_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
+CV_EXPORTS NCVStatus ncvDrawRects_32u_host(Ncv32u *h_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
                                             NcvRect32u *h_rects, Ncv32u numRects, Ncv32u color);
 
 
-NCV_EXPORTS NCVStatus ncvDrawRects_8u_device(Ncv8u *d_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
+CV_EXPORTS NCVStatus ncvDrawRects_8u_device(Ncv8u *d_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
                                              NcvRect32u *d_rects, Ncv32u numRects, Ncv8u color, cudaStream_t cuStream);
 
 
-NCV_EXPORTS NCVStatus ncvDrawRects_32u_device(Ncv32u *d_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
+CV_EXPORTS NCVStatus ncvDrawRects_32u_device(Ncv32u *d_dst, Ncv32u dstStride, Ncv32u dstWidth, Ncv32u dstHeight,
                                               NcvRect32u *d_rects, Ncv32u numRects, Ncv32u color, cudaStream_t cuStream);
 
 

modules/gpunvidia/include/opencv2/gpunvidia/NCVBroxOpticalFlow.hpp

@@ -92,7 +92,7 @@ struct NCVBroxOpticalFlowDescriptor
 /// \return                        computation status
 /////////////////////////////////////////////////////////////////////////////////////////
 
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,
                              INCVMemAllocator &gpu_mem_allocator,
                              const NCVMatrix<Ncv32f> &frame0,

modules/gpunvidia/include/opencv2/gpunvidia/NCVHaarObjectDetection.hpp

@@ -355,7 +355,7 @@ enum
 };
 
 
-NCV_EXPORTS NCVStatus ncvDetectObjectsMultiScale_device(NCVMatrix<Ncv8u> &d_srcImg,
+CV_EXPORTS NCVStatus ncvDetectObjectsMultiScale_device(NCVMatrix<Ncv8u> &d_srcImg,
                                                         NcvSize32u srcRoi,
                                                         NCVVector<NcvRect32u> &d_dstRects,
                                                         Ncv32u &dstNumRects,
@@ -382,7 +382,7 @@ NCV_EXPORTS NCVStatus ncvDetectObjectsMultiScale_device(NCVMatrix<Ncv8u> &d_srcI
 #define HAAR_STDDEV_BORDER                  1
 
 
-NCV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_device(NCVMatrix<Ncv32u> &d_integralImage,
+CV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_device(NCVMatrix<Ncv32u> &d_integralImage,
                                                            NCVMatrix<Ncv32f> &d_weights,
                                                            NCVMatrixAlloc<Ncv32u> &d_pixelMask,
                                                            Ncv32u &numDetections,
@@ -401,7 +401,7 @@ NCV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_device(NCVMatrix<Ncv32u> &d_
                                                            cudaStream_t cuStream);
 
 
-NCV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_host(NCVMatrix<Ncv32u> &h_integralImage,
+CV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_host(NCVMatrix<Ncv32u> &h_integralImage,
                                                          NCVMatrix<Ncv32f> &h_weights,
                                                          NCVMatrixAlloc<Ncv32u> &h_pixelMask,
                                                          Ncv32u &numDetections,
@@ -418,7 +418,7 @@ NCV_EXPORTS NCVStatus ncvApplyHaarClassifierCascade_host(NCVMatrix<Ncv32u> &h_in
 #define RECT_SIMILARITY_PROPORTION      0.2f
 
 
-NCV_EXPORTS NCVStatus ncvGrowDetectionsVector_device(NCVVector<Ncv32u> &pixelMask,
+CV_EXPORTS NCVStatus ncvGrowDetectionsVector_device(NCVVector<Ncv32u> &pixelMask,
                                                      Ncv32u numPixelMaskDetections,
                                                      NCVVector<NcvRect32u> &hypotheses,
                                                      Ncv32u &totalDetections,
@@ -429,7 +429,7 @@ NCV_EXPORTS NCVStatus ncvGrowDetectionsVector_device(NCVVector<Ncv32u> &pixelMas
                                                      cudaStream_t cuStream);
 
 
-NCV_EXPORTS NCVStatus ncvGrowDetectionsVector_host(NCVVector<Ncv32u> &pixelMask,
+CV_EXPORTS NCVStatus ncvGrowDetectionsVector_host(NCVVector<Ncv32u> &pixelMask,
                                                    Ncv32u numPixelMaskDetections,
                                                    NCVVector<NcvRect32u> &hypotheses,
                                                    Ncv32u &totalDetections,
@@ -439,18 +439,18 @@ NCV_EXPORTS NCVStatus ncvGrowDetectionsVector_host(NCVVector<Ncv32u> &pixelMask,
                                                    Ncv32f curScale);
 
 
-NCV_EXPORTS NCVStatus ncvHaarGetClassifierSize(const cv::String &filename, Ncv32u &numStages,
+CV_EXPORTS NCVStatus ncvHaarGetClassifierSize(const cv::String &filename, Ncv32u &numStages,
                                                Ncv32u &numNodes, Ncv32u &numFeatures);
 
 
-NCV_EXPORTS NCVStatus ncvHaarLoadFromFile_host(const cv::String &filename,
+CV_EXPORTS NCVStatus ncvHaarLoadFromFile_host(const cv::String &filename,
                                                HaarClassifierCascadeDescriptor &haar,
                                                NCVVector<HaarStage64> &h_HaarStages,
                                                NCVVector<HaarClassifierNode128> &h_HaarNodes,
                                                NCVVector<HaarFeature64> &h_HaarFeatures);
 
 
-NCV_EXPORTS NCVStatus ncvHaarStoreNVBIN_host(const cv::String &filename,
+CV_EXPORTS NCVStatus ncvHaarStoreNVBIN_host(const cv::String &filename,
                                              HaarClassifierCascadeDescriptor haar,
                                              NCVVector<HaarStage64> &h_HaarStages,
                                              NCVVector<HaarClassifierNode128> &h_HaarNodes,

modules/gpunvidia/include/opencv2/gpunvidia/NCVPyramid.hpp

@@ -50,7 +50,7 @@
 #if 0 //def _WIN32
 
 template <class T>
-class NCV_EXPORTS NCVMatrixStack
+class CV_EXPORTS NCVMatrixStack
 {
 public:
     NCVMatrixStack() {this->_arr.clear();}
@@ -71,7 +71,7 @@ private:
 
 
 template <class T>
-class NCV_EXPORTS NCVImagePyramid
+class CV_EXPORTS NCVImagePyramid
 {
 public:
 

modules/gpunvidia/include/opencv2/gpunvidia/private.hpp

@@ -75,7 +75,7 @@ namespace cv { namespace gpu
         cudaStream_t oldStream;
     };
 
-    NCV_EXPORTS cv::String getNcvErrorMessage(int code);
+    CV_EXPORTS cv::String getNcvErrorMessage(int code);
 
     static inline void checkNcvError(int err, const char* file, const int line, const char* func)
     {

modules/gpunvidia/src/NCV.cpp

@@ -755,13 +755,6 @@ static void groupRectangles(std::vector<NcvRect32u> &hypotheses, int groupThresh
 }
 
 
-//===================================================================
-//
-// Operations with rectangles
-//
-//===================================================================
-
-
 
 NCVStatus ncvGroupRectangles_host(NCVVector<NcvRect32u> &hypotheses,
                                   Ncv32u &numHypotheses,