From d22d964ce74d688e7e8eda5491913272df300ce1 Mon Sep 17 00:00:00 2001 From: Sam Shum <25998453+supercrazysam@users.noreply.github.com> Date: Mon, 1 Jun 2020 00:36:31 -0400 Subject: [PATCH] [Jetson JetPack 4.2 OpenCV 4.1.1] https://github.com/ros-perception/vision_opencv/issues/272#issuecomment-471311300 --- cv_bridge/src/module_opencv3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cv_bridge/src/module_opencv3.cpp b/cv_bridge/src/module_opencv3.cpp index 68c1b2007..fe2b677c8 100644 --- a/cv_bridge/src/module_opencv3.cpp +++ b/cv_bridge/src/module_opencv3.cpp @@ -107,7 +107,7 @@ class NumpyAllocator : public MatAllocator return u; } - UMatData* allocate(int dims0, const int* sizes, int type, void* data, size_t* step, int flags, UMatUsageFlags usageFlags) const + UMatData* allocate(int dims0, const int* sizes, int type, void* data, size_t* step, AccessFlag flags, UMatUsageFlags usageFlags) const { if( data != 0 ) { @@ -136,7 +136,7 @@ class NumpyAllocator : public MatAllocator return allocate(o, dims0, sizes, type, step); } - bool allocate(UMatData* u, int accessFlags, UMatUsageFlags usageFlags) const + bool allocate(UMatData* u, AccessFlag accessFlags, UMatUsageFlags usageFlags) const { return stdAllocator->allocate(u, accessFlags, usageFlags); }