replaced NCV_EXPORTS with CV_EXPORTS

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/NCV.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/NCV.hpp
index e029e1f..e993c64 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/NCV.hpp
+++ b/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);
 
 

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/NCVBroxOpticalFlow.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/NCVBroxOpticalFlow.hpp
index 3300e10..0634fff 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/NCVBroxOpticalFlow.hpp
+++ b/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,

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/NCVHaarObjectDetection.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/NCVHaarObjectDetection.hpp
index c067a91..323c629 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/NCVHaarObjectDetection.hpp
+++ b/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,

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/NCVPyramid.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/NCVPyramid.hpp
index c88dbc2..91972c5 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/NCVPyramid.hpp
+++ b/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:
 

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/NPP_staging.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/NPP_staging.hpp
index 823be69..2df393a 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/NPP_staging.hpp
+++ b/modules/gpunvidia/include/opencv2/gpunvidia/NPP_staging.hpp
@@ -63,7 +63,7 @@
  * NOT THREAD SAFE
  * \return Current CUDA stream
  */
-NCV_EXPORTS
+CV_EXPORTS
 cudaStream_t nppStGetActiveCUDAstream();
 
 
@@ -73,7 +73,7 @@ cudaStream_t nppStGetActiveCUDAstream();
  * \param cudaStream        [IN] cudaStream CUDA stream to become current
  * \return CUDA stream used before
  */
-NCV_EXPORTS
+CV_EXPORTS
 cudaStream_t nppStSetActiveCUDAstream(cudaStream_t cudaStream);
 
 
@@ -142,7 +142,7 @@ enum NppStInterpMode
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStGetInterpolationBufferSize(NcvSize32u srcSize,
                                            Ncv32u nStep,
                                            Ncv32u *hpSize);
@@ -155,7 +155,7 @@ NCVStatus nppiStGetInterpolationBufferSize(NcvSize32u srcSize,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStInterpolateFrames(const NppStInterpolationState *pState);
 
 
@@ -177,7 +177,7 @@ NCVStatus nppiStInterpolateFrames(const NppStInterpolationState *pState);
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStFilterRowBorder_32f_C1R(const Ncv32f *pSrc,
                                         NcvSize32u srcSize,
                                         Ncv32u nSrcStep,
@@ -210,7 +210,7 @@ NCVStatus nppiStFilterRowBorder_32f_C1R(const Ncv32f *pSrc,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStFilterColumnBorder_32f_C1R(const Ncv32f *pSrc,
                                            NcvSize32u srcSize,
                                            Ncv32u nSrcStep,
@@ -233,7 +233,7 @@ NCVStatus nppiStFilterColumnBorder_32f_C1R(const Ncv32f *pSrc,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStVectorWarpGetBufferSize(NcvSize32u srcSize,
                                         Ncv32u nSrcStep,
                                         Ncv32u *hpSize);
@@ -259,7 +259,7 @@ NCVStatus nppiStVectorWarpGetBufferSize(NcvSize32u srcSize,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStVectorWarp_PSF1x1_32f_C1(const Ncv32f *pSrc,
                                          NcvSize32u srcSize,
                                          Ncv32u nSrcStep,
@@ -290,7 +290,7 @@ NCVStatus nppiStVectorWarp_PSF1x1_32f_C1(const Ncv32f *pSrc,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStVectorWarp_PSF2x2_32f_C1(const Ncv32f *pSrc,
                                          NcvSize32u srcSize,
                                          Ncv32u nSrcStep,
@@ -320,7 +320,7 @@ NCVStatus nppiStVectorWarp_PSF2x2_32f_C1(const Ncv32f *pSrc,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStResize_32f_C1R(const Ncv32f *pSrc,
                                NcvSize32u srcSize,
                                Ncv32u nSrcStep,
@@ -347,7 +347,7 @@ NCVStatus nppiStResize_32f_C1R(const Ncv32f *pSrc,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32u_C1R(Ncv32u *d_src, Ncv32u srcStep,
                                  Ncv32u *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -358,7 +358,7 @@ NCVStatus nppiStDecimate_32u_C1R(Ncv32u *d_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 32-bit signed pixels, single channel.
  * \see nppiStDecimate_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32s_C1R(Ncv32s *d_src, Ncv32u srcStep,
                                  Ncv32s *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -369,7 +369,7 @@ NCVStatus nppiStDecimate_32s_C1R(Ncv32s *d_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 32-bit float pixels, single channel.
  * \see nppiStDecimate_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32f_C1R(Ncv32f *d_src, Ncv32u srcStep,
                                  Ncv32f *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -380,7 +380,7 @@ NCVStatus nppiStDecimate_32f_C1R(Ncv32f *d_src, Ncv32u srcStep,
 * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit unsigned pixels, single channel.
 * \see nppiStDecimate_32u_C1R
 */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64u_C1R(Ncv64u *d_src, Ncv32u srcStep,
                                  Ncv64u *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -391,7 +391,7 @@ NCVStatus nppiStDecimate_64u_C1R(Ncv64u *d_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit signed pixels, single channel.
  * \see nppiStDecimate_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64s_C1R(Ncv64s *d_src, Ncv32u srcStep,
                                  Ncv64s *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -402,7 +402,7 @@ NCVStatus nppiStDecimate_64s_C1R(Ncv64s *d_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit float pixels, single channel.
  * \see nppiStDecimate_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64f_C1R(Ncv64f *d_src, Ncv32u srcStep,
                                  Ncv64f *d_dst, Ncv32u dstStep,
                                  NcvSize32u srcRoi, Ncv32u scale,
@@ -421,7 +421,7 @@ NCVStatus nppiStDecimate_64f_C1R(Ncv64f *d_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32u_C1R_host(Ncv32u *h_src, Ncv32u srcStep,
                                       Ncv32u *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -431,7 +431,7 @@ NCVStatus nppiStDecimate_32u_C1R_host(Ncv32u *h_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 32-bit signed pixels, single channel. Host implementation.
  * \see nppiStDecimate_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32s_C1R_host(Ncv32s *h_src, Ncv32u srcStep,
                                       Ncv32s *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -441,7 +441,7 @@ NCVStatus nppiStDecimate_32s_C1R_host(Ncv32s *h_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 32-bit float pixels, single channel. Host implementation.
  * \see nppiStDecimate_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_32f_C1R_host(Ncv32f *h_src, Ncv32u srcStep,
                                       Ncv32f *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -451,7 +451,7 @@ NCVStatus nppiStDecimate_32f_C1R_host(Ncv32f *h_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit unsigned pixels, single channel. Host implementation.
  * \see nppiStDecimate_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64u_C1R_host(Ncv64u *h_src, Ncv32u srcStep,
                                       Ncv64u *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -461,7 +461,7 @@ NCVStatus nppiStDecimate_64u_C1R_host(Ncv64u *h_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit signed pixels, single channel. Host implementation.
  * \see nppiStDecimate_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64s_C1R_host(Ncv64s *h_src, Ncv32u srcStep,
                                       Ncv64s *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -471,7 +471,7 @@ NCVStatus nppiStDecimate_64s_C1R_host(Ncv64s *h_src, Ncv32u srcStep,
  * Downsamples (decimates) an image using the nearest neighbor algorithm. 64-bit float pixels, single channel. Host implementation.
  * \see nppiStDecimate_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStDecimate_64f_C1R_host(Ncv64f *h_src, Ncv32u srcStep,
                                       Ncv64f *h_dst, Ncv32u dstStep,
                                       NcvSize32u srcRoi, Ncv32u scale);
@@ -493,7 +493,7 @@ NCVStatus nppiStDecimate_64f_C1R_host(Ncv64f *h_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStRectStdDev_32f_C1R(Ncv32u *d_sum, Ncv32u sumStep,
                                    Ncv64u *d_sqsum, Ncv32u sqsumStep,
                                    Ncv32f *d_norm, Ncv32u normStep,
@@ -516,7 +516,7 @@ NCVStatus nppiStRectStdDev_32f_C1R(Ncv32u *d_sum, Ncv32u sumStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStRectStdDev_32f_C1R_host(Ncv32u *h_sum, Ncv32u sumStep,
                                         Ncv64u *h_sqsum, Ncv32u sqsumStep,
                                         Ncv32f *h_norm, Ncv32u normStep,
@@ -535,7 +535,7 @@ NCVStatus nppiStRectStdDev_32f_C1R_host(Ncv32u *h_sum, Ncv32u sumStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32u_C1R(Ncv32u *d_src, Ncv32u srcStride,
                                   Ncv32u *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -544,7 +544,7 @@ NCVStatus nppiStTranspose_32u_C1R(Ncv32u *d_src, Ncv32u srcStride,
  * Transposes an image. 32-bit signed pixels, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32s_C1R(Ncv32s *d_src, Ncv32u srcStride,
                                   Ncv32s *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -553,7 +553,7 @@ NCVStatus nppiStTranspose_32s_C1R(Ncv32s *d_src, Ncv32u srcStride,
  * Transposes an image. 32-bit float pixels, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32f_C1R(Ncv32f *d_src, Ncv32u srcStride,
                                   Ncv32f *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -562,7 +562,7 @@ NCVStatus nppiStTranspose_32f_C1R(Ncv32f *d_src, Ncv32u srcStride,
  * Transposes an image. 64-bit unsigned pixels, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64u_C1R(Ncv64u *d_src, Ncv32u srcStride,
                                   Ncv64u *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -571,7 +571,7 @@ NCVStatus nppiStTranspose_64u_C1R(Ncv64u *d_src, Ncv32u srcStride,
  * Transposes an image. 64-bit signed pixels, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64s_C1R(Ncv64s *d_src, Ncv32u srcStride,
                                   Ncv64s *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -580,7 +580,7 @@ NCVStatus nppiStTranspose_64s_C1R(Ncv64s *d_src, Ncv32u srcStride,
  * Transposes an image. 64-bit float pixels, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64f_C1R(Ncv64f *d_src, Ncv32u srcStride,
                                   Ncv64f *d_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -589,7 +589,7 @@ NCVStatus nppiStTranspose_64f_C1R(Ncv64f *d_src, Ncv32u srcStride,
  * Transposes an image. 128-bit pixels of any type, single channel
  * \see nppiStTranspose_32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_128_C1R(void *d_src, Ncv32u srcStep,
                                   void *d_dst, Ncv32u dstStep, NcvSize32u srcRoi);
 
@@ -605,7 +605,7 @@ NCVStatus nppiStTranspose_128_C1R(void *d_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32u_C1R_host(Ncv32u *h_src, Ncv32u srcStride,
                                        Ncv32u *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -614,7 +614,7 @@ NCVStatus nppiStTranspose_32u_C1R_host(Ncv32u *h_src, Ncv32u srcStride,
  * Transposes an image. 32-bit signed pixels, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32s_C1R_host(Ncv32s *h_src, Ncv32u srcStride,
                                        Ncv32s *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -623,7 +623,7 @@ NCVStatus nppiStTranspose_32s_C1R_host(Ncv32s *h_src, Ncv32u srcStride,
  * Transposes an image. 32-bit float pixels, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_32f_C1R_host(Ncv32f *h_src, Ncv32u srcStride,
                                        Ncv32f *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -632,7 +632,7 @@ NCVStatus nppiStTranspose_32f_C1R_host(Ncv32f *h_src, Ncv32u srcStride,
  * Transposes an image. 64-bit unsigned pixels, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64u_C1R_host(Ncv64u *h_src, Ncv32u srcStride,
                                        Ncv64u *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -641,7 +641,7 @@ NCVStatus nppiStTranspose_64u_C1R_host(Ncv64u *h_src, Ncv32u srcStride,
  * Transposes an image. 64-bit signed pixels, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64s_C1R_host(Ncv64s *h_src, Ncv32u srcStride,
                                        Ncv64s *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -650,7 +650,7 @@ NCVStatus nppiStTranspose_64s_C1R_host(Ncv64s *h_src, Ncv32u srcStride,
  * Transposes an image. 64-bit float pixels, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_64f_C1R_host(Ncv64f *h_src, Ncv32u srcStride,
                                        Ncv64f *h_dst, Ncv32u dstStride, NcvSize32u srcRoi);
 
@@ -659,7 +659,7 @@ NCVStatus nppiStTranspose_64f_C1R_host(Ncv64f *h_src, Ncv32u srcStride,
  * Transposes an image. 128-bit pixels of any type, single channel. Host implementation
  * \see nppiStTranspose_32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStTranspose_128_C1R_host(void *d_src, Ncv32u srcStep,
                                        void *d_dst, Ncv32u dstStep, NcvSize32u srcRoi);
 
@@ -673,7 +673,7 @@ NCVStatus nppiStTranspose_128_C1R_host(void *d_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegralGetSize_8u32u(NcvSize32u roiSize, Ncv32u *pBufsize, cudaDeviceProp &devProp);
 
 
@@ -681,7 +681,7 @@ NCVStatus nppiStIntegralGetSize_8u32u(NcvSize32u roiSize, Ncv32u *pBufsize, cuda
  * Calculates the size of the temporary buffer for integral image creation
  * \see nppiStIntegralGetSize_8u32u
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegralGetSize_32f32f(NcvSize32u roiSize, Ncv32u *pBufsize, cudaDeviceProp &devProp);
 
 
@@ -699,7 +699,7 @@ NCVStatus nppiStIntegralGetSize_32f32f(NcvSize32u roiSize, Ncv32u *pBufsize, cud
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegral_8u32u_C1R(Ncv8u *d_src, Ncv32u srcStep,
                                    Ncv32u *d_dst, Ncv32u dstStep, NcvSize32u roiSize,
                                    Ncv8u *pBuffer, Ncv32u bufSize, cudaDeviceProp &devProp);
@@ -709,7 +709,7 @@ NCVStatus nppiStIntegral_8u32u_C1R(Ncv8u *d_src, Ncv32u srcStep,
  * Creates an integral image representation for the input image
  * \see nppiStIntegral_8u32u_C1R
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegral_32f32f_C1R(Ncv32f *d_src, Ncv32u srcStep,
                                     Ncv32f *d_dst, Ncv32u dstStep, NcvSize32u roiSize,
                                     Ncv8u *pBuffer, Ncv32u bufSize, cudaDeviceProp &devProp);
@@ -726,7 +726,7 @@ NCVStatus nppiStIntegral_32f32f_C1R(Ncv32f *d_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegral_8u32u_C1R_host(Ncv8u *h_src, Ncv32u srcStep,
                                         Ncv32u *h_dst, Ncv32u dstStep, NcvSize32u roiSize);
 
@@ -735,7 +735,7 @@ NCVStatus nppiStIntegral_8u32u_C1R_host(Ncv8u *h_src, Ncv32u srcStep,
  * Creates an integral image representation for the input image. Host implementation
  * \see nppiStIntegral_8u32u_C1R_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStIntegral_32f32f_C1R_host(Ncv32f *h_src, Ncv32u srcStep,
                                          Ncv32f *h_dst, Ncv32u dstStep, NcvSize32u roiSize);
 
@@ -749,7 +749,7 @@ NCVStatus nppiStIntegral_32f32f_C1R_host(Ncv32f *h_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStSqrIntegralGetSize_8u64u(NcvSize32u roiSize, Ncv32u *pBufsize, cudaDeviceProp &devProp);
 
 
@@ -767,7 +767,7 @@ NCVStatus nppiStSqrIntegralGetSize_8u64u(NcvSize32u roiSize, Ncv32u *pBufsize, c
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStSqrIntegral_8u64u_C1R(Ncv8u *d_src, Ncv32u srcStep,
                                       Ncv64u *d_dst, Ncv32u dstStep, NcvSize32u roiSize,
                                       Ncv8u *pBuffer, Ncv32u bufSize, cudaDeviceProp &devProp);
@@ -784,7 +784,7 @@ NCVStatus nppiStSqrIntegral_8u64u_C1R(Ncv8u *d_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppiStSqrIntegral_8u64u_C1R_host(Ncv8u *h_src, Ncv32u srcStep,
                                            Ncv64u *h_dst, Ncv32u dstStep, NcvSize32u roiSize);
 
@@ -806,7 +806,7 @@ NCVStatus nppiStSqrIntegral_8u64u_C1R_host(Ncv8u *h_src, Ncv32u srcStep,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompactGetSize_32u(Ncv32u srcLen, Ncv32u *pBufsize, cudaDeviceProp &devProp);
 
 
@@ -838,7 +838,7 @@ NCVStatus nppsStCompactGetSize_32f(Ncv32u srcLen, Ncv32u *pBufsize, cudaDevicePr
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32u(Ncv32u *d_src, Ncv32u srcLen,
                             Ncv32u *d_dst, Ncv32u *p_dstLen,
                             Ncv32u elemRemove, Ncv8u *pBuffer,
@@ -849,7 +849,7 @@ NCVStatus nppsStCompact_32u(Ncv32u *d_src, Ncv32u srcLen,
  * Compacts the input vector by removing elements of specified value. 32-bit signed values
  * \see nppsStCompact_32u
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32s(Ncv32s *d_src, Ncv32u srcLen,
                             Ncv32s *d_dst, Ncv32u *p_dstLen,
                             Ncv32s elemRemove, Ncv8u *pBuffer,
@@ -860,7 +860,7 @@ NCVStatus nppsStCompact_32s(Ncv32s *d_src, Ncv32u srcLen,
  * Compacts the input vector by removing elements of specified value. 32-bit float values
  * \see nppsStCompact_32u
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32f(Ncv32f *d_src, Ncv32u srcLen,
                             Ncv32f *d_dst, Ncv32u *p_dstLen,
                             Ncv32f elemRemove, Ncv8u *pBuffer,
@@ -878,7 +878,7 @@ NCVStatus nppsStCompact_32f(Ncv32f *d_src, Ncv32u srcLen,
  *
  * \return NCV status code
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32u_host(Ncv32u *h_src, Ncv32u srcLen,
                                  Ncv32u *h_dst, Ncv32u *dstLen, Ncv32u elemRemove);
 
@@ -887,7 +887,7 @@ NCVStatus nppsStCompact_32u_host(Ncv32u *h_src, Ncv32u srcLen,
  * Compacts the input vector by removing elements of specified value. 32-bit signed values. Host implementation
  * \see nppsStCompact_32u_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32s_host(Ncv32s *h_src, Ncv32u srcLen,
                                  Ncv32s *h_dst, Ncv32u *dstLen, Ncv32s elemRemove);
 
@@ -896,7 +896,7 @@ NCVStatus nppsStCompact_32s_host(Ncv32s *h_src, Ncv32u srcLen,
  * Compacts the input vector by removing elements of specified value. 32-bit float values. Host implementation
  * \see nppsStCompact_32u_host
  */
-NCV_EXPORTS
+CV_EXPORTS
 NCVStatus nppsStCompact_32f_host(Ncv32f *h_src, Ncv32u srcLen,
                                  Ncv32f *h_dst, Ncv32u *dstLen, Ncv32f elemRemove);
 

diff --git a/modules/gpunvidia/include/opencv2/gpunvidia/private.hpp b/modules/gpunvidia/include/opencv2/gpunvidia/private.hpp
index e86aaac..f23e536 100644 (file)
--- a/modules/gpunvidia/include/opencv2/gpunvidia/private.hpp
+++ b/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)
     {

diff --git a/modules/gpunvidia/src/NCV.cpp b/modules/gpunvidia/src/NCV.cpp
index bf1531d..c31f2a3 100644 (file)
--- a/modules/gpunvidia/src/NCV.cpp
+++ b/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,