diff --git a/samples/gpu/opticalflow_nvidia_api.cpp b/samples/gpu/opticalflow_nvidia_api.cpp index 836504a4e..9532636f6 100644 --- a/samples/gpu/opticalflow_nvidia_api.cpp +++ b/samples/gpu/opticalflow_nvidia_api.cpp @@ -27,7 +27,8 @@ int main( int argc, const char** argv ) } #else -using std::tr1::shared_ptr; +//using std::tr1::shared_ptr; +using cv::Ptr; #define PARAM_INPUT "--input" #define PARAM_SCALE "--scale" @@ -39,8 +40,8 @@ using std::tr1::shared_ptr; #define PARAM_TIME_STEP "--time-step" #define PARAM_HELP "--help" -shared_ptr g_pGPUMemAllocator; -shared_ptr g_pHostMemAllocator; +Ptr g_pGPUMemAllocator; +Ptr g_pHostMemAllocator; class RgbToMonochrome { @@ -83,9 +84,9 @@ public: }; template -NCVStatus CopyData(IplImage *image, shared_ptr> &dst) +NCVStatus CopyData(IplImage *image, Ptr> &dst) { - dst = shared_ptr> (new NCVMatrixAlloc (*g_pHostMemAllocator, image->width, image->height)); + dst = Ptr> (new NCVMatrixAlloc (*g_pHostMemAllocator, image->width, image->height)); ncvAssertReturn (dst->isMemAllocated (), NCV_ALLOCATOR_BAD_ALLOC); unsigned char *row = reinterpret_cast (image->imageData); @@ -137,8 +138,8 @@ NCVStatus LoadImages (const char *frame0Name, const char *frame1Name, int &width, int &height, - shared_ptr> &src, - shared_ptr> &dst, + Ptr> &src, + Ptr> &dst, IplImage *&firstFrame, IplImage *&lastFrame) { @@ -394,16 +395,16 @@ int main(int argc, char **argv) std::cout << "Using GPU: " << devId << "(" << devProp.name << "), arch=" << devProp.major << "." << devProp.minor << std::endl; - g_pGPUMemAllocator = shared_ptr (new NCVMemNativeAllocator (NCVMemoryTypeDevice, devProp.textureAlignment)); + g_pGPUMemAllocator = Ptr (new NCVMemNativeAllocator (NCVMemoryTypeDevice, devProp.textureAlignment)); ncvAssertPrintReturn (g_pGPUMemAllocator->isInitialized (), "Device memory allocator isn't initialized", -1); - g_pHostMemAllocator = shared_ptr (new NCVMemNativeAllocator (NCVMemoryTypeHostPageable, devProp.textureAlignment)); + g_pHostMemAllocator = Ptr (new NCVMemNativeAllocator (NCVMemoryTypeHostPageable, devProp.textureAlignment)); ncvAssertPrintReturn (g_pHostMemAllocator->isInitialized (), "Host memory allocator isn't initialized", -1); int width, height; - shared_ptr> src_host; - shared_ptr> dst_host; + Ptr> src_host; + Ptr> dst_host; IplImage *firstFrame, *lastFrame; if (frame0Name != 0 && frame1Name != 0) @@ -415,10 +416,10 @@ int main(int argc, char **argv) ncvAssertReturnNcvStat (LoadImages ("frame10.bmp", "frame11.bmp", width, height, src_host, dst_host, firstFrame, lastFrame)); } - shared_ptr> src (new NCVMatrixAlloc (*g_pGPUMemAllocator, src_host->width (), src_host->height ())); + Ptr> src (new NCVMatrixAlloc (*g_pGPUMemAllocator, src_host->width (), src_host->height ())); ncvAssertReturn(src->isMemAllocated(), -1); - shared_ptr> dst (new NCVMatrixAlloc (*g_pGPUMemAllocator, src_host->width (), src_host->height ())); + Ptr> dst (new NCVMatrixAlloc (*g_pGPUMemAllocator, src_host->width (), src_host->height ())); ncvAssertReturn (dst->isMemAllocated (), -1); ncvAssertReturnNcvStat (src_host->copySolid ( *src, 0 ));