The Wayback Machine - https://web.archive.org/web/20210828113921/https://github.com/matplotlib/matplotlib/pull/20873/files
Skip to content

/ matplotlib

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove mplutils.cpp; shorten mplutils.h. #20873

Merged
merged 1 commit into from Aug 21, 2021
+42 −77
Merged

Remove mplutils.cpp; shorten mplutils.h. #20873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

4 setupext.py
View file
Open in desktop
@@ -371,7 +371,6 @@ def get_extensions(self):
# agg
ext = Extension(
"matplotlib.backends._backend_agg", [
"src/mplutils.cpp",
"src/py_converters.cpp",
"src/_backend_agg.cpp",
"src/_backend_agg_wrapper.cpp",
@@ -403,7 +402,6 @@ def get_extensions(self):
"matplotlib.ft2font", [
"src/ft2font.cpp",
"src/ft2font_wrapper.cpp",
"src/mplutils.cpp",
"src/py_converters.cpp",
])
FreeType.add_flags(ext)
@@ -413,7 +411,6 @@ def get_extensions(self):
# image
ext = Extension(
"matplotlib._image", [
"src/mplutils.cpp",
"src/_image_wrapper.cpp",
"src/py_converters.cpp",
])
@@ -454,7 +451,6 @@ def get_extensions(self):
"matplotlib._tri", [
"src/tri/_tri.cpp",
"src/tri/_tri_wrapper.cpp",
"src/mplutils.cpp",
])
add_numpy_flags(ext)
yield ext
12 src/ft2font.cpp
View file
Open in desktop
@@ -99,13 +99,13 @@ void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y)
FT_Int char_width = bitmap->width;
FT_Int char_height = bitmap->rows;

FT_Int x1 = CLAMP(x, 0, image_width);
FT_Int y1 = CLAMP(y, 0, image_height);
FT_Int x2 = CLAMP(x + char_width, 0, image_width);
FT_Int y2 = CLAMP(y + char_height, 0, image_height);
FT_Int x1 = std::min(std::max(x, 0), image_width);
FT_Int y1 = std::min(std::max(y, 0), image_height);
FT_Int x2 = std::min(std::max(x + char_width, 0), image_width);
FT_Int y2 = std::min(std::max(y + char_height, 0), image_height);

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

if (bitmap->pixel_mode == FT_PIXEL_MODE_GRAY) {
for (FT_Int i = y1; i < y2; ++i) {
74 src/ft2font_wrapper.cpp
View file
Open in desktop
@@ -1574,44 +1574,42 @@ PyMODINIT_FUNC PyInit_ft2font(void)
return NULL;
}

PyObject *d = PyModule_GetDict(m);

if (add_dict_int(d, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
add_dict_int(d, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
add_dict_int(d, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
add_dict_int(d, "SFNT", FT_FACE_FLAG_SFNT) ||
add_dict_int(d, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
add_dict_int(d, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
add_dict_int(d, "KERNING", FT_FACE_FLAG_KERNING) ||
add_dict_int(d, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
add_dict_int(d, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
add_dict_int(d, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
add_dict_int(d, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
add_dict_int(d, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
add_dict_int(d, "BOLD", FT_STYLE_FLAG_BOLD) ||
add_dict_int(d, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
add_dict_int(d, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
add_dict_int(d, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
add_dict_int(d, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
add_dict_int(d, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
add_dict_int(d, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
add_dict_int(d, "LOAD_RENDER", FT_LOAD_RENDER) ||
add_dict_int(d, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
add_dict_int(d, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
add_dict_int(d, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
add_dict_int(d, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
add_dict_int(d, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
add_dict_int(d, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
add_dict_int(d, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
add_dict_int(d, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
add_dict_int(d, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
add_dict_int(d, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
add_dict_int(d, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
add_dict_int(d, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
add_dict_int(d, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
add_dict_int(d, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
add_dict_int(d, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
add_dict_int(d, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
if (PyModule_AddIntConstant(m, "SCALABLE", FT_FACE_FLAG_SCALABLE) ||
PyModule_AddIntConstant(m, "FIXED_SIZES", FT_FACE_FLAG_FIXED_SIZES) ||
PyModule_AddIntConstant(m, "FIXED_WIDTH", FT_FACE_FLAG_FIXED_WIDTH) ||
PyModule_AddIntConstant(m, "SFNT", FT_FACE_FLAG_SFNT) ||
PyModule_AddIntConstant(m, "HORIZONTAL", FT_FACE_FLAG_HORIZONTAL) ||
PyModule_AddIntConstant(m, "VERTICAL", FT_FACE_FLAG_VERTICAL) ||
PyModule_AddIntConstant(m, "KERNING", FT_FACE_FLAG_KERNING) ||
PyModule_AddIntConstant(m, "FAST_GLYPHS", FT_FACE_FLAG_FAST_GLYPHS) ||
PyModule_AddIntConstant(m, "MULTIPLE_MASTERS", FT_FACE_FLAG_MULTIPLE_MASTERS) ||
PyModule_AddIntConstant(m, "GLYPH_NAMES", FT_FACE_FLAG_GLYPH_NAMES) ||
PyModule_AddIntConstant(m, "EXTERNAL_STREAM", FT_FACE_FLAG_EXTERNAL_STREAM) ||
PyModule_AddIntConstant(m, "ITALIC", FT_STYLE_FLAG_ITALIC) ||
PyModule_AddIntConstant(m, "BOLD", FT_STYLE_FLAG_BOLD) ||
PyModule_AddIntConstant(m, "KERNING_DEFAULT", FT_KERNING_DEFAULT) ||
PyModule_AddIntConstant(m, "KERNING_UNFITTED", FT_KERNING_UNFITTED) ||
PyModule_AddIntConstant(m, "KERNING_UNSCALED", FT_KERNING_UNSCALED) ||
PyModule_AddIntConstant(m, "LOAD_DEFAULT", FT_LOAD_DEFAULT) ||
PyModule_AddIntConstant(m, "LOAD_NO_SCALE", FT_LOAD_NO_SCALE) ||
PyModule_AddIntConstant(m, "LOAD_NO_HINTING", FT_LOAD_NO_HINTING) ||
PyModule_AddIntConstant(m, "LOAD_RENDER", FT_LOAD_RENDER) ||
PyModule_AddIntConstant(m, "LOAD_NO_BITMAP", FT_LOAD_NO_BITMAP) ||
PyModule_AddIntConstant(m, "LOAD_VERTICAL_LAYOUT", FT_LOAD_VERTICAL_LAYOUT) ||
PyModule_AddIntConstant(m, "LOAD_FORCE_AUTOHINT", FT_LOAD_FORCE_AUTOHINT) ||
PyModule_AddIntConstant(m, "LOAD_CROP_BITMAP", FT_LOAD_CROP_BITMAP) ||
PyModule_AddIntConstant(m, "LOAD_PEDANTIC", FT_LOAD_PEDANTIC) ||
PyModule_AddIntConstant(m, "LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH", FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH) ||
PyModule_AddIntConstant(m, "LOAD_NO_RECURSE", FT_LOAD_NO_RECURSE) ||
PyModule_AddIntConstant(m, "LOAD_IGNORE_TRANSFORM", FT_LOAD_IGNORE_TRANSFORM) ||
PyModule_AddIntConstant(m, "LOAD_MONOCHROME", FT_LOAD_MONOCHROME) ||
PyModule_AddIntConstant(m, "LOAD_LINEAR_DESIGN", FT_LOAD_LINEAR_DESIGN) ||
PyModule_AddIntConstant(m, "LOAD_NO_AUTOHINT", (unsigned long)FT_LOAD_NO_AUTOHINT) ||
PyModule_AddIntConstant(m, "LOAD_TARGET_NORMAL", (unsigned long)FT_LOAD_TARGET_NORMAL) ||
PyModule_AddIntConstant(m, "LOAD_TARGET_LIGHT", (unsigned long)FT_LOAD_TARGET_LIGHT) ||
PyModule_AddIntConstant(m, "LOAD_TARGET_MONO", (unsigned long)FT_LOAD_TARGET_MONO) ||
PyModule_AddIntConstant(m, "LOAD_TARGET_LCD", (unsigned long)FT_LOAD_TARGET_LCD) ||
PyModule_AddIntConstant(m, "LOAD_TARGET_LCD_V", (unsigned long)FT_LOAD_TARGET_LCD_V)) {
Py_DECREF(m);
return NULL;
}
21 src/mplutils.cpp
View file
Open in desktop

This file was deleted.

8 src/mplutils.h
View file
Open in desktop
@@ -29,12 +29,6 @@

#include <Python.h>

#undef CLAMP
#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))

#undef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))

inline double mpl_round(double v)
{
return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
@@ -52,6 +46,4 @@ enum {

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

extern "C" int add_dict_int(PyObject *dict, const char *key, long val);

#endif
ProTip! Use n and p to navigate between commits in a pull request.