From 78e678b1f81d279e2da475aa51d53e577b4f7177 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Mon, 3 Oct 2011 10:14:59 +0000 Subject: [PATCH] optflow_gpu compilation under ubuntu --- samples/gpu/opticalflow_nvidia_api.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/gpu/opticalflow_nvidia_api.cpp b/samples/gpu/opticalflow_nvidia_api.cpp index 9532636..160e987 100644 --- a/samples/gpu/opticalflow_nvidia_api.cpp +++ b/samples/gpu/opticalflow_nvidia_api.cpp @@ -84,9 +84,9 @@ public: }; template -NCVStatus CopyData(IplImage *image, Ptr> &dst) +NCVStatus CopyData(IplImage *image, Ptr >& dst) { - dst = 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); @@ -138,8 +138,8 @@ NCVStatus LoadImages (const char *frame0Name, const char *frame1Name, int &width, int &height, - Ptr> &src, - Ptr> &dst, + Ptr > &src, + Ptr > &dst, IplImage *&firstFrame, IplImage *&lastFrame) { @@ -403,8 +403,8 @@ int main(int argc, char **argv) int width, height; - Ptr> src_host; - Ptr> dst_host; + Ptr > src_host; + Ptr > dst_host; IplImage *firstFrame, *lastFrame; if (frame0Name != 0 && frame1Name != 0) @@ -416,10 +416,10 @@ int main(int argc, char **argv) ncvAssertReturnNcvStat (LoadImages ("frame10.bmp", "frame11.bmp", width, height, src_host, dst_host, firstFrame, lastFrame)); } - 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); - 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 )); -- 2.7.4