mirror of
https://github.com/opencv/opencv.git
synced 2024-12-12 07:09:12 +08:00
2791bb7062
python: accept path-like objects wherever file names are expected #24773 Merry Christmas, all 🎄 Implements #15731 Support is enabled for all arguments named `filename` or `filepath` (case-insensitive), or annotated with `CV_WRAP_FILE_PATH`. Support is based on `PyOS_FSPath`, which is available in Python 3.6+. When running on older Python versions the arguments must have a `str` value as before. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
70 lines
1.6 KiB
C++
70 lines
1.6 KiB
C++
#ifndef CV2_HPP
|
|
#define CV2_HPP
|
|
|
|
//warning number '5033' not a valid compiler warning in vc12
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
|
// eliminating duplicated round() declaration
|
|
#define HAVE_ROUND 1
|
|
#pragma warning(push)
|
|
#pragma warning(disable:5033) // 'register' is no longer a supported storage class
|
|
#endif
|
|
|
|
// #define CVPY_DYNAMIC_INIT
|
|
// #define Py_DEBUG
|
|
|
|
#if defined(CVPY_DYNAMIC_INIT) && !defined(Py_DEBUG)
|
|
# ifndef PYTHON3_LIMITED_API_VERSION
|
|
# define PYTHON3_LIMITED_API_VERSION 0x03060000
|
|
# endif
|
|
# define Py_LIMITED_API PYTHON3_LIMITED_API_VERSION
|
|
#endif
|
|
|
|
#include <cmath>
|
|
#include <Python.h>
|
|
#include <limits>
|
|
|
|
#if PY_MAJOR_VERSION < 3
|
|
#undef CVPY_DYNAMIC_INIT
|
|
#else
|
|
#define CV_PYTHON_3 1
|
|
#endif
|
|
|
|
#if defined(_MSC_VER) && (_MSC_VER > 1800)
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#define MODULESTR "cv2"
|
|
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
|
|
|
|
#include <numpy/ndarrayobject.h>
|
|
|
|
#include "pycompat.hpp"
|
|
|
|
class ArgInfo
|
|
{
|
|
private:
|
|
static const uint32_t arg_outputarg_flag = 0x1;
|
|
static const uint32_t arg_arithm_op_src_flag = 0x2;
|
|
static const uint32_t arg_pathlike_flag = 0x4;
|
|
|
|
public:
|
|
const char* name;
|
|
bool outputarg;
|
|
bool arithm_op_src;
|
|
bool pathlike;
|
|
// more fields may be added if necessary
|
|
|
|
ArgInfo(const char* name_, uint32_t arg_) :
|
|
name(name_),
|
|
outputarg((arg_ & arg_outputarg_flag) != 0),
|
|
arithm_op_src((arg_ & arg_arithm_op_src_flag) != 0),
|
|
pathlike((arg_ & arg_pathlike_flag) != 0) {}
|
|
|
|
private:
|
|
ArgInfo(const ArgInfo&) = delete;
|
|
ArgInfo& operator=(const ArgInfo&) = delete;
|
|
};
|
|
|
|
|
|
#endif // CV2_HPP
|