Skip to content

Commit 5db55de

Browse files
committed
Remove old-style Python-C++ converters
And merge the two files now that there are no old ones.
1 parent 5a51fa2 commit 5db55de

8 files changed

+166
-756
lines changed

src/_backend_agg_wrapper.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "numpy_cpp.h"
66
#include "py_converters.h"
77
#include "_backend_agg.h"
8-
#include "py_converters_11.h"
98

109
namespace py = pybind11;
1110
using namespace pybind11::literals;

src/_image_wrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <pybind11/numpy.h>
33

44
#include "_image_resample.h"
5-
#include "py_converters_11.h"
5+
#include "py_converters.h"
66

77
namespace py = pybind11;
88
using namespace pybind11::literals;

src/_path_wrapper.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "_backend_agg_basic_types.h"
1515
#include "py_adaptors.h"
1616
#include "py_converters.h"
17-
#include "py_converters_11.h"
1817

1918
namespace py = pybind11;
2019
using namespace pybind11::literals;

src/meson.build

+1-6
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ extension_data = {
7373
'_backend_agg': {
7474
'subdir': 'matplotlib/backends',
7575
'sources': files(
76-
'py_converters.cpp',
77-
'py_converters_11.cpp',
7876
'_backend_agg.cpp',
7977
'_backend_agg_wrapper.cpp',
8078
),
@@ -92,7 +90,6 @@ extension_data = {
9290
'sources': files(
9391
'ft2font.cpp',
9492
'ft2font_wrapper.cpp',
95-
'py_converters.cpp',
9693
),
9794
'dependencies': [
9895
freetype_dep, pybind11_dep, numpy_dep, agg_dep.partial_dependency(includes: true),
@@ -107,7 +104,7 @@ extension_data = {
107104
'subdir': 'matplotlib',
108105
'sources': files(
109106
'_image_wrapper.cpp',
110-
'py_converters_11.cpp',
107+
'py_converters.cpp',
111108
),
112109
'dependencies': [
113110
pybind11_dep,
@@ -118,8 +115,6 @@ extension_data = {
118115
'_path': {
119116
'subdir': 'matplotlib',
120117
'sources': files(
121-
'py_converters.cpp',
122-
'py_converters_11.cpp',
123118
'_path_wrapper.cpp',
124119
),
125120
'dependencies': [numpy_dep, agg_dep, pybind11_dep],

0 commit comments

Comments
 (0)