Merge pull request #26120 from QuLogic/fix-warnings

jklymak · web-flow · commit 4b5fc9478d4f · 2023-06-13T21:59:01.000-07:00
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -511,7 +511,7 @@ int convert_points(PyObject *obj, void *pointsp)
         return 1;
     }
     if (!points->set(obj)
-        || points->size() && !check_trailing_shape(*points, "points", 2)) {
+        || (points->size() && !check_trailing_shape(*points, "points", 2))) {
         return 0;
     }
     return 1;
@@ -524,7 +524,7 @@ int convert_transforms(PyObject *obj, void *transp)
         return 1;
     }
     if (!trans->set(obj)
-        || trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {
+        || (trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3))) {
         return 0;
     }
     return 1;
@@ -537,7 +537,7 @@ int convert_bboxes(PyObject *obj, void *bboxp)
         return 1;
     }
     if (!bbox->set(obj)
-        || bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {
+        || (bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2))) {
         return 0;
     }
     return 1;
@@ -550,7 +550,7 @@ int convert_colors(PyObject *obj, void *colorsp)
         return 1;
     }
     if (!colors->set(obj)
-        || colors->size() && !check_trailing_shape(*colors, "colors", 4)) {
+        || (colors->size() && !check_trailing_shape(*colors, "colors", 4))) {
         return 0;
     }
     return 1;

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ int convert_points(PyObject obj, void pointsp)`
`511`	`511`	`return 1;`
`512`	`512`	`}`
`513`	`513`	`if (!points->set(obj)`
`514`		`- \|\| points->size() && !check_trailing_shape(*points, "points", 2)) {`
	`514`	`+ \|\| (points->size() && !check_trailing_shape(*points, "points", 2))) {`
`515`	`515`	`return 0;`
`516`	`516`	`}`
`517`	`517`	`return 1;`
`@@ -524,7 +524,7 @@ int convert_transforms(PyObject obj, void transp)`
`524`	`524`	`return 1;`
`525`	`525`	`}`
`526`	`526`	`if (!trans->set(obj)`
`527`		`- \|\| trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3)) {`
	`527`	`+ \|\| (trans->size() && !check_trailing_shape(*trans, "transforms", 3, 3))) {`
`528`	`528`	`return 0;`
`529`	`529`	`}`
`530`	`530`	`return 1;`
`@@ -537,7 +537,7 @@ int convert_bboxes(PyObject obj, void bboxp)`
`537`	`537`	`return 1;`
`538`	`538`	`}`
`539`	`539`	`if (!bbox->set(obj)`
`540`		`- \|\| bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2)) {`
	`540`	`+ \|\| (bbox->size() && !check_trailing_shape(*bbox, "bbox array", 2, 2))) {`
`541`	`541`	`return 0;`
`542`	`542`	`}`
`543`	`543`	`return 1;`
`@@ -550,7 +550,7 @@ int convert_colors(PyObject obj, void colorsp)`
`550`	`550`	`return 1;`
`551`	`551`	`}`
`552`	`552`	`if (!colors->set(obj)`
`553`		`- \|\| colors->size() && !check_trailing_shape(*colors, "colors", 4)) {`
	`553`	`+ \|\| (colors->size() && !check_trailing_shape(*colors, "colors", 4))) {`
`554`	`554`	`return 0;`
`555`	`555`	`}`
`556`	`556`	`return 1;`