Fix warnings about incorrect format specifiers.

QuLogic · QuLogic · commit ad050914b68c · 2016-11-25T19:44:12.000-05:00
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -459,14 +459,14 @@ PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args, PyObjec
 
     if (points.dim(0) != 3 || points.dim(1) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "points must be a 3x2 array, got %dx%d",
+                     "points must be a 3x2 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      points.dim(0), points.dim(1));
         return NULL;
     }
 
     if (colors.dim(0) != 3 || colors.dim(1) != 4) {
         PyErr_Format(PyExc_ValueError,
-                     "colors must be a 3x4 array, got %dx%d",
+                     "colors must be a 3x4 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      colors.dim(0), colors.dim(1));
         return NULL;
     }
@@ -500,21 +500,21 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args, PyObje
 
     if (points.size() != 0 && (points.dim(1) != 3 || points.dim(2) != 2)) {
         PyErr_Format(PyExc_ValueError,
-                     "points must be a Nx3x2 array, got %dx%dx%d",
+                     "points must be a Nx3x2 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      points.dim(0), points.dim(1), points.dim(2));
         return NULL;
     }
 
     if (colors.size() != 0 && (colors.dim(1) != 3 || colors.dim(2) != 4)) {
         PyErr_Format(PyExc_ValueError,
-                     "colors must be a Nx3x4 array, got %dx%dx%d",
+                     "colors must be a Nx3x4 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      colors.dim(0), colors.dim(1), colors.dim(2));
         return NULL;
     }
 
     if (points.size() != colors.size()) {
         PyErr_Format(PyExc_ValueError,
-                     "points and colors arrays must be the same length, got %d and %d",
+                     "points and colors arrays must be the same length, got %" NPY_INTP_FMT " and %" NPY_INTP_FMT,
                      points.dim(0), colors.dim(0));
         return NULL;
     }
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -273,7 +273,7 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
         } else {
             PyErr_Format(
                 PyExc_ValueError,
-                "If 3-dimensional, array must be RGBA.  Got %d planes.",
+                "If 3-dimensional, array must be RGBA.  Got %" NPY_INTP_FMT " planes.",
                 PyArray_DIM(input_array, 2));
             goto error;
         }
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -201,7 +201,7 @@ static PyObject *Py_update_path_extents(PyObject *self, PyObject *args, PyObject
 
     if (minpos.dim(0) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "minpos must be of length 2, got %d",
+                     "minpos must be of length 2, got %" NPY_INTP_FMT,
                      minpos.dim(0));
         return NULL;
     }
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -537,7 +537,7 @@ int convert_points(PyObject *obj, void *pointsp)
 
     if (points->dim(1) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "Points must be Nx2 array, got %dx%d",
+                     "Points must be Nx2 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      points->dim(0), points->dim(1));
         return 0;
     }
@@ -561,7 +561,7 @@ int convert_transforms(PyObject *obj, void *transp)
 
     if (trans->dim(1) != 3 || trans->dim(2) != 3) {
         PyErr_Format(PyExc_ValueError,
-                     "Transforms must be Nx3x3 array, got %dx%dx%d",
+                     "Transforms must be Nx3x3 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      trans->dim(0), trans->dim(1), trans->dim(2));
         return 0;
     }
@@ -585,7 +585,7 @@ int convert_bboxes(PyObject *obj, void *bboxp)
 
     if (bbox->dim(1) != 2 || bbox->dim(2) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "Bbox array must be Nx2x2 array, got %dx%dx%d",
+                     "Bbox array must be Nx2x2 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      bbox->dim(0), bbox->dim(1), bbox->dim(2));
         return 0;
     }
@@ -609,7 +609,7 @@ int convert_colors(PyObject *obj, void *colorsp)
 
     if (colors->dim(1) != 4) {
         PyErr_Format(PyExc_ValueError,
-                     "Colors array must be Nx4 array, got %dx%d",
+                     "Colors array must be Nx4 array, got %" NPY_INTP_FMT "x%" NPY_INTP_FMT,
                      colors->dim(0), colors->dim(1));
         return 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ image_resample(PyObject self, PyObject args, PyObject *kwargs)`
`273`	`273`	`} else {`
`274`	`274`	`PyErr_Format(`
`275`	`275`	`PyExc_ValueError,`
`276`		`- "If 3-dimensional, array must be RGBA. Got %d planes.",`
	`276`	`+ "If 3-dimensional, array must be RGBA. Got %" NPY_INTP_FMT " planes.",`
`277`	`277`	`PyArray_DIM(input_array, 2));`
`278`	`278`	`goto error;`
`279`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static PyObject Py_update_path_extents(PyObject self, PyObject *args, PyObject`
`201`	`201`
`202`	`202`	`if (minpos.dim(0) != 2) {`
`203`	`203`	`PyErr_Format(PyExc_ValueError,`
`204`		`- "minpos must be of length 2, got %d",`
	`204`	`+ "minpos must be of length 2, got %" NPY_INTP_FMT,`
`205`	`205`	`minpos.dim(0));`
`206`	`206`	`return NULL;`
`207`	`207`	`}`