diff --git a/cv_bridge/src/module_opencv4.cpp b/cv_bridge/src/module_opencv4.cpp index ac93f089..085e77b1 100644 --- a/cv_bridge/src/module_opencv4.cpp +++ b/cv_bridge/src/module_opencv4.cpp @@ -6,8 +6,6 @@ #include "opencv2/opencv_modules.hpp" -#include "pycompat.hpp" - static PyObject * opencv_error = 0; static int failmsg(const char * fmt, ...) @@ -199,8 +197,8 @@ static bool pyopencv_to(PyObject * o, Mat & m, const ArgInfo info) return true; } - if (PyInt_Check(o) ) { - double v[] = {static_cast(PyInt_AsLong(reinterpret_cast(o))), 0., 0., 0.}; + if (PyLong_Check(o) ) { + double v[] = {static_cast(PyLong_AsLong(reinterpret_cast(o))), 0., 0., 0.}; m = Mat(4, 1, CV_64F, v).clone(); return true; } @@ -214,8 +212,8 @@ static bool pyopencv_to(PyObject * o, Mat & m, const ArgInfo info) m = Mat(sz, 1, CV_64F); for (i = 0; i < sz; i++) { PyObject * oi = PyTuple_GET_ITEM(o, i); - if (PyInt_Check(oi) ) { - m.at(i) = static_cast(PyInt_AsLong(oi)); + if (PyLong_Check(oi) ) { + m.at(i) = static_cast(PyLong_AsLong(oi)); } else if (PyFloat_Check(oi) ) { m.at(i) = static_cast(PyFloat_AsDouble(oi)); } else { diff --git a/cv_bridge/src/pycompat.hpp b/cv_bridge/src/pycompat.hpp deleted file mode 100644 index 576d9300..00000000 --- a/cv_bridge/src/pycompat.hpp +++ /dev/null @@ -1,71 +0,0 @@ -/*M/////////////////////////////////////////////////////////////////////////////////////// -// -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. -// -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. -// -// -// License Agreement -// For Open Source Computer Vision Library -// -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. -// Copyright (c) 2018 Intel Corporation. -// Third party copyrights are property of their respective owners. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// * Redistribution's of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Redistribution's in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage. -// -//M*/ - -// Defines for Python 2/3 compatibility. -#ifndef PYCOMPAT_HPP_ -#define PYCOMPAT_HPP_ - -#if PY_MAJOR_VERSION >= 3 -// Python3 treats all ints as longs, PyInt_X functions have been removed. -#define PyInt_Check PyLong_Check -#define PyInt_CheckExact PyLong_CheckExact -#define PyInt_AsLong PyLong_AsLong -#define PyInt_AS_LONG PyLong_AS_LONG -#define PyInt_FromLong PyLong_FromLong -#define PyNumber_Int PyNumber_Long - -// Python3 strings are unicode, these defines mimic the Python2 functionality. -#define PyString_Check PyUnicode_Check -#define PyString_FromString PyUnicode_FromString -#define PyString_FromStringAndSize PyUnicode_FromStringAndSize -#define PyString_Size PyUnicode_GET_SIZE - -// PyUnicode_AsUTF8 isn't available until Python 3.3 -#if (PY_VERSION_HEX < 0x03030000) -#define PyString_AsString _PyUnicode_AsString -#else -#define PyString_AsString PyUnicode_AsUTF8 -#endif -#endif - -#endif // PYCOMPAT_HPP_