From 574ce6e1bd716c869ba1afc1908870bba1d3dc71 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Thu, 9 Jul 2020 14:36:42 -0700 Subject: [PATCH] Add missing return statement in numpy import This reflects a patch made in https://github.com/boostorg/python/pull/218 I've also updated the return signature to match upstream. Signed-off-by: Jacob Perron --- cv_bridge/src/module.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cv_bridge/src/module.hpp b/cv_bridge/src/module.hpp index 97dcc17fa..3306f2d70 100644 --- a/cv_bridge/src/module.hpp +++ b/cv_bridge/src/module.hpp @@ -42,9 +42,10 @@ PyObject * pyopencv_from(const cv::Mat & m); #endif #if PYTHON3 -static int do_numpy_import() +static void * do_numpy_import() { import_array(); + return NULL; } #else static void do_numpy_import()