Merge pull request #22604 from oscargus/pathtypefix

tacaswell · web-flow · commit 921e9ac89cec · 2022-03-05T22:15:57.000-05:00
MNT: Fix types in C-code to reduce warnings
diff --git a/src/_path.h b/src/_path.h
@@ -840,7 +840,7 @@ inline bool segments_intersect(const double &x1,
 
     // If den == 0 we have two possibilities:
     if (isclose(den, 0.0)) {
-        float t_area = (x2*y3 - x3*y2) - x1*(y3 - y2) + y1*(x3 - x2);
+        double t_area = (x2*y3 - x3*y2) - x1*(y3 - y2) + y1*(x3 - x2);
         // 1 - If the area of the triangle made by the 3 first points (2 from the first segment
         // plus one from the second) is zero, they are collinear
         if (isclose(t_area, 0.0)) {
@@ -852,7 +852,6 @@ inline bool segments_intersect(const double &x1,
             else {
                 return (fmin(x1, x2) <= fmin(x3, x4) && fmin(x3, x4) <= fmax(x1, x2)) ||
                         (fmin(x3, x4) <= fmin(x1, x2) && fmin(x1, x2) <= fmax(x3, x4));
-                
             }
         }
         // 2 - If t_area is not zero, the segments are parallel, but not collinear
@@ -876,7 +875,6 @@ inline bool segments_intersect(const double &x1,
 template <class PathIterator1, class PathIterator2>
 bool path_intersects_path(PathIterator1 &p1, PathIterator2 &p2)
 {
-    
     typedef PathNanRemover<py::PathIterator> no_nans_t;
     typedef agg::conv_curve<no_nans_t> curve_t;
 
@@ -901,7 +899,6 @@ bool path_intersects_path(PathIterator1 &p1, PathIterator2 &p2)
         }
         c2.rewind(0);
         c2.vertex(&x21, &y21);
-        
 
         while (c2.vertex(&x22, &y22) != agg::path_cmd_stop) {
             // if the segment in path 2 is (almost) 0 length, skip to next vertex
@@ -1147,16 +1144,15 @@ bool __convert_to_string(PathIterator &path,
     double last_x = 0.0;
     double last_y = 0.0;
 
-    int size = 0;
     unsigned code;
 
     while ((code = path.vertex(&x[0], &y[0])) != agg::path_cmd_stop) {
         if (code == CLOSEPOLY) {
             buffer += codes[4];
         } else if (code < 5) {
-            size = NUM_VERTICES[code];
+            size_t size = NUM_VERTICES[code];
 
-            for (int i = 1; i < size; ++i) {
+            for (size_t i = 1; i < size; ++i) {
                 unsigned subcode = path.vertex(&x[i], &y[i]);
                 if (subcode != code) {
                     return false;
@@ -1176,7 +1172,7 @@ bool __convert_to_string(PathIterator &path,
                 buffer += ' ';
             }
 
-            for (int i = 0; i < size; ++i) {
+            for (size_t i = 0; i < size; ++i) {
                 __add_number(x[i], format_code, precision, buffer);
                 buffer += ' ';
                 __add_number(y[i], format_code, precision, buffer);
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -551,8 +551,8 @@ void FT2Font::get_bitmap_offset(long *x, long *y)
 
 void FT2Font::draw_glyphs_to_bitmap(bool antialiased)
 {
-    size_t width = (bbox.xMax - bbox.xMin) / 64 + 2;
-    size_t height = (bbox.yMax - bbox.yMin) / 64 + 2;
+    long width = (bbox.xMax - bbox.xMin) / 64 + 2;
+    long height = (bbox.yMax - bbox.yMin) / 64 + 2;
 
     image.resize(width, height);
 
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -291,7 +291,7 @@ static unsigned long read_from_file_callback(FT_Stream stream,
             return 1;  // Non-zero signals error, when count == 0.
         }
     }
-    return n_read;
+    return PyLong_AsUnsignedLong(PyLong_FromSsize_t(n_read));
 }
 
 static void close_file_callback(FT_Stream stream)
@@ -589,7 +589,7 @@ const char *PyFT2Font_get_num_glyphs__doc__ =
 
 static PyObject *PyFT2Font_get_num_glyphs(PyFT2Font *self, PyObject *args)
 {
-    return PyLong_FromLong(self->x->get_num_glyphs());
+    return PyLong_FromSize_t(self->x->get_num_glyphs());
 }
 
 const char *PyFT2Font_load_char__doc__ =
@@ -1545,7 +1545,7 @@ PyMODINIT_FUNC PyInit_ft2font(void)
     FT_Int major, minor, patch;
     char version_string[64];
     FT_Library_Version(_ft2Library, &major, &minor, &patch);
-    sprintf(version_string, "%d.%d.%d", major, minor, patch);
+    snprintf(version_string, sizeof(version_string), "%d.%d.%d", major, minor, patch);
 
     PyObject *m = PyModule_Create(&moduledef);
     if (!m ||

Original file line number	Diff line number	Diff line change
`@@ -551,8 +551,8 @@ void FT2Font::get_bitmap_offset(long x, long y)`
`551`	`551`
`552`	`552`	`void FT2Font::draw_glyphs_to_bitmap(bool antialiased)`
`553`	`553`	`{`
`554`		`- size_t width = (bbox.xMax - bbox.xMin) / 64 + 2;`
`555`		`- size_t height = (bbox.yMax - bbox.yMin) / 64 + 2;`
	`554`	`+ long width = (bbox.xMax - bbox.xMin) / 64 + 2;`
	`555`	`+ long height = (bbox.yMax - bbox.yMin) / 64 + 2;`
`556`	`556`
`557`	`557`	`image.resize(width, height);`
`558`	`558`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ static unsigned long read_from_file_callback(FT_Stream stream,`
`291`	`291`	`return 1; // Non-zero signals error, when count == 0.`
`292`	`292`	`}`
`293`	`293`	`}`
`294`		`- return n_read;`
	`294`	`+ return PyLong_AsUnsignedLong(PyLong_FromSsize_t(n_read));`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`static void close_file_callback(FT_Stream stream)`
`@@ -589,7 +589,7 @@ const char *PyFT2Font_get_num_glyphs__doc__ =`
`589`	`589`
`590`	`590`	`static PyObject PyFT2Font_get_num_glyphs(PyFT2Font self, PyObject *args)`
`591`	`591`	`{`
`592`		`- return PyLong_FromLong(self->x->get_num_glyphs());`
	`592`	`+ return PyLong_FromSize_t(self->x->get_num_glyphs());`
`593`	`593`	`}`
`594`	`594`
`595`	`595`	`const char *PyFT2Font_load_char__doc__ =`
`@@ -1545,7 +1545,7 @@ PyMODINIT_FUNC PyInit_ft2font(void)`
`1545`	`1545`	`FT_Int major, minor, patch;`
`1546`	`1546`	`char version_string[64];`
`1547`	`1547`	`FT_Library_Version(_ft2Library, &major, &minor, &patch);`
`1548`		`- sprintf(version_string, "%d.%d.%d", major, minor, patch);`
	`1548`	`+ snprintf(version_string, sizeof(version_string), "%d.%d.%d", major, minor, patch);`
`1549`	`1549`
`1550`	`1550`	`PyObject *m = PyModule_Create(&moduledef);`
`1551`	`1551`	`if (!m \|\|`