Skip to content

Commit 67d04a8

Browse files
tacaswelltacaswell
authored
Merge pull request matplotlib#20873 from anntzer/mplutils
MNT: Remove mplutils.cpp; shorten mplutils.h.
2 parents 63de810 + 17261d5 commit 67d04a8

File tree

5 files changed

+42
-77
lines changed

5 files changed

+42
-77
lines changed

‎setupext.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ def get_extensions(self):
371371
# agg
372372
ext = Extension(
373373
"matplotlib.backends._backend_agg", [
374-
"src/mplutils.cpp",
375374
"src/py_converters.cpp",
376375
"src/_backend_agg.cpp",
377376
"src/_backend_agg_wrapper.cpp",
@@ -403,7 +402,6 @@ def get_extensions(self):
403402
"matplotlib.ft2font", [
404403
"src/ft2font.cpp",
405404
"src/ft2font_wrapper.cpp",
406-
"src/mplutils.cpp",
407405
"src/py_converters.cpp",
408406
])
409407
FreeType.add_flags(ext)
@@ -413,7 +411,6 @@ def get_extensions(self):
413411
# image
414412
ext = Extension(
415413
"matplotlib._image", [
416-
"src/mplutils.cpp",
417414
"src/_image_wrapper.cpp",
418415
"src/py_converters.cpp",
419416
])
@@ -454,7 +451,6 @@ def get_extensions(self):
454451
"matplotlib._tri", [
455452
"src/tri/_tri.cpp",
456453
"src/tri/_tri_wrapper.cpp",
457-
"src/mplutils.cpp",
458454
])
459455
add_numpy_flags(ext)
460456
yield ext

‎src/ft2font.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y)
9999
FT_Int char_width = bitmap->width;
100100
FT_Int char_height = bitmap->rows;
101101

102-
FT_Int x1 = CLAMP(x, 0, image_width);
103-
FT_Int y1 = CLAMP(y, 0, image_height);
104-
FT_Int x2 = CLAMP(x + char_width, 0, image_width);
105-
FT_Int y2 = CLAMP(y + char_height, 0, image_height);
102+
FT_Int x1 = std::min(std::max(x, 0), image_width);
103+
FT_Int y1 = std::min(std::max(y, 0), image_height);
104+
FT_Int x2 = std::min(std::max(x + char_width, 0), image_width);
105+
FT_Int y2 = std::min(std::max(y + char_height, 0), image_height);
106106

107-
FT_Int x_start = MAX(0, -x);
108-
FT_Int y_offset = y1 - MAX(0, -y);
107+
FT_Int x_start = std::max(0, -x);
108+
FT_Int y_offset = y1 - std::max(0, -y);
109109

110110
if (bitmap->pixel_mode == FT_PIXEL_MODE_GRAY) {
111111
for (FT_Int i = y1; i < y2; ++i) {

‎src/ft2font_wrapper.cpp‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,44 +1564,42 @@ PyMODINIT_FUNC PyInit_ft2font(void)
15641564
return NULL;
15651565
}
15661566

1567-
PyObject *d = PyModule_GetDict(m);
1568-
1569-
if (add_dict_int(d, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
1570-
add_dict_int(d, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
1571-
add_dict_int(d, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
1572-
add_dict_int(d, "SFNT", FT_FACE_FLAG_SFNT) ||
1573-
add_dict_int(d, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
1574-
add_dict_int(d, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
1575-
add_dict_int(d, "KERNING", FT_FACE_FLAG_KERNING) ||
1576-
add_dict_int(d, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
1577-
add_dict_int(d, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
1578-
add_dict_int(d, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
1579-
add_dict_int(d, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
1580-
add_dict_int(d, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
1581-
add_dict_int(d, "BOLD", FT_STYLE_FLAG_BOLD) ||
1582-
add_dict_int(d, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
1583-
add_dict_int(d, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
1584-
add_dict_int(d, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
1585-
add_dict_int(d, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
1586-
add_dict_int(d, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
1587-
add_dict_int(d, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
1588-
add_dict_int(d, "LOAD_RENDER", FT_LOAD_RENDER) ||
1589-
add_dict_int(d, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
1590-
add_dict_int(d, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
1591-
add_dict_int(d, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
1592-
add_dict_int(d, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
1593-
add_dict_int(d, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
1594-
add_dict_int(d, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
1595-
add_dict_int(d, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
1596-
add_dict_int(d, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
1597-
add_dict_int(d, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
1598-
add_dict_int(d, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
1599-
add_dict_int(d, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
1600-
add_dict_int(d, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
1601-
add_dict_int(d, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
1602-
add_dict_int(d, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
1603-
add_dict_int(d, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
1604-
add_dict_int(d, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
1567+
if (PyModule_AddIntConstant(m, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
1568+
PyModule_AddIntConstant(m, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
1569+
PyModule_AddIntConstant(m, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
1570+
PyModule_AddIntConstant(m, "SFNT", FT_FACE_FLAG_SFNT) ||
1571+
PyModule_AddIntConstant(m, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
1572+
PyModule_AddIntConstant(m, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
1573+
PyModule_AddIntConstant(m, "KERNING", FT_FACE_FLAG_KERNING) ||
1574+
PyModule_AddIntConstant(m, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
1575+
PyModule_AddIntConstant(m, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
1576+
PyModule_AddIntConstant(m, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
1577+
PyModule_AddIntConstant(m, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
1578+
PyModule_AddIntConstant(m, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
1579+
PyModule_AddIntConstant(m, "BOLD", FT_STYLE_FLAG_BOLD) ||
1580+
PyModule_AddIntConstant(m, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
1581+
PyModule_AddIntConstant(m, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
1582+
PyModule_AddIntConstant(m, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
1583+
PyModule_AddIntConstant(m, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
1584+
PyModule_AddIntConstant(m, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
1585+
PyModule_AddIntConstant(m, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
1586+
PyModule_AddIntConstant(m, "LOAD_RENDER", FT_LOAD_RENDER) ||
1587+
PyModule_AddIntConstant(m, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
1588+
PyModule_AddIntConstant(m, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
1589+
PyModule_AddIntConstant(m, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
1590+
PyModule_AddIntConstant(m, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
1591+
PyModule_AddIntConstant(m, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
1592+
PyModule_AddIntConstant(m, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
1593+
PyModule_AddIntConstant(m, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
1594+
PyModule_AddIntConstant(m, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
1595+
PyModule_AddIntConstant(m, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
1596+
PyModule_AddIntConstant(m, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
1597+
PyModule_AddIntConstant(m, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
1598+
PyModule_AddIntConstant(m, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
1599+
PyModule_AddIntConstant(m, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
1600+
PyModule_AddIntConstant(m, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
1601+
PyModule_AddIntConstant(m, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
1602+
PyModule_AddIntConstant(m, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
16051603
Py_DECREF(m);
16061604
return NULL;
16071605
}

‎src/mplutils.cpp‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/mplutils.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929

3030
#include <Python.h>
3131

32-
#undef CLAMP
33-
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
34-
35-
#undef MAX
36-
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
37-
3832
inline double mpl_round(double v)
3933
{
4034
return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
@@ -52,6 +46,4 @@ enum {
5246

5347
const size_t NUM_VERTICES[] = { 1, 1, 1, 2, 3, 1 };
5448

55-
extern "C" int add_dict_int(PyObject *dict, const char *key, long val);
56-
5749
#endif

0 commit comments

Comments
 (0)