Merge pull request #13871 from meeseeksmachine/auto-backport-of-pr-13868-on-v3.1.x

dstansby · web-flow · commit 629950699e71 · 2019-04-03T21:00:17.000+01:00
Backport PR #13868 on branch v3.1.x (Correctly handle fallout of defining PY_SSIZE_T_CLEAN on Windows.)
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1260,15 +1260,15 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
                              t->sFamilyClass,
                              "panose",
                              t->panose,
-                             10,
+                             Py_ssize_t(10),
                              "ulCharRange",
                              t->ulUnicodeRange1,
                              t->ulUnicodeRange2,
                              t->ulUnicodeRange3,
                              t->ulUnicodeRange4,
                              "achVendID",
                              t->achVendID,
-                             4,
+                             Py_ssize_t(4),
                              "fsSelection",
                              t->fsSelection,
                              "fsFirstCharIndex",
@@ -1394,10 +1394,10 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
                              t->SymbolSet,
                              "typeFace",
                              t->TypeFace,
-                             16,
+                             Py_ssize_t(16),
                              "characterComplement",
                              t->CharacterComplement,
-                             8,
+                             Py_ssize_t(8),
                              "strokeWeight",
                              t->StrokeWeight,
                              "widthType",
