Revert "Fix clang formatter warnings. These are long ints so format a… · matplotlib/matplotlib@dca5e99 · GitHub

1. matplotlib
2. matplotlib

Repository navigation

• Code
• Issues1.1k (1.1k)
• Pull requests434 (434)
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit dca5e99

Browse filesBrowse the repository at this point in the historyBrowse files

jenshnielsen

committed

Revert "Fix clang formatter warnings. These are long ints so format as such"

This reverts commit eab5a9a.

1 parent dc6245b commit dca5e99
Copy full SHA for dca5e99

4 files changed

+11-11Lines changed: 11 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • _backend_agg_wrapper.cpp
  • _image_wrapper.cpp
  • _path_wrapper.cpp
  • py_converters.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/_backend_agg_wrapper.cpp‎

Copy file name to clipboardExpand all lines: src/_backend_agg_wrapper.cpp

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -449,14 +449,14 @@ PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args, PyObjec
449	449
450	450	if (points.dim(0) != 3 || points.dim(1) != 2) {
451	451	PyErr_Format(PyExc_ValueError,
452		- "points must be a 3x2 array, got %ldx%ld",
	452	+ "points must be a 3x2 array, got %dx%d",
453	453	points.dim(0), points.dim(1));
454	454	return NULL;
455	455	}
456	456
457	457	if (colors.dim(0) != 3 || colors.dim(1) != 4) {
458	458	PyErr_Format(PyExc_ValueError,
459		- "colors must be a 3x4 array, got %ldx%ld",
	459	+ "colors must be a 3x4 array, got %dx%d",
460	460	colors.dim(0), colors.dim(1));
461	461	return NULL;
462	462	}
@@ -490,21 +490,21 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args, PyObje
490	490
491	491	if (points.size() != 0 && (points.dim(1) != 3 || points.dim(2) != 2)) {
492	492	PyErr_Format(PyExc_ValueError,
493		- "points must be a Nx3x2 array, got %ldx%ldx%ld",
	493	+ "points must be a Nx3x2 array, got %dx%dx%d",
494	494	points.dim(0), points.dim(1), points.dim(2));
495	495	return NULL;
496	496	}
497	497
498	498	if (colors.size() != 0 && (colors.dim(1) != 3 || colors.dim(2) != 4)) {
499	499	PyErr_Format(PyExc_ValueError,
500		- "colors must be a Nx3x4 array, got %ldx%ldx%ld",
	500	+ "colors must be a Nx3x4 array, got %dx%dx%d",
501	501	colors.dim(0), colors.dim(1), colors.dim(2));
502	502	return NULL;
503	503	}
504	504
505	505	if (points.size() != colors.size()) {
506	506	PyErr_Format(PyExc_ValueError,
507		- "points and colors arrays must be the same length, got %ld and %ld",
	507	+ "points and colors arrays must be the same length, got %d and %d",
508	508	points.dim(0), colors.dim(0));
509	509	return NULL;
510	510	}

Collapse file

‎src/_image_wrapper.cpp‎

Copy file name to clipboardExpand all lines: src/_image_wrapper.cpp

+1-1Lines changed: 1 addition & 1 deletion

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 %ld planes.",
	276	+ "If 3-dimensional, array must be RGBA. Got %d planes.",
277	277	PyArray_DIM(input_array, 2));
278	278	goto error;
279	279	}

Collapse file

‎src/_path_wrapper.cpp‎

Copy file name to clipboardExpand all lines: src/_path_wrapper.cpp

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -214,7 +214,7 @@ static PyObject *Py_update_path_extents(PyObject *self, PyObject *args, PyObject
214	214
215	215	if (minpos.dim(0) != 2) {
216	216	PyErr_Format(PyExc_ValueError,
217		- "minpos must be of length 2, got %ld",
	217	+ "minpos must be of length 2, got %d",
218	218	minpos.dim(0));
219	219	return NULL;
220	220	}

Collapse file

‎src/py_converters.cpp‎

Copy file name to clipboardExpand all lines: src/py_converters.cpp

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -535,7 +535,7 @@ int convert_points(PyObject *obj, void *pointsp)
535	535
536	536	if (points->dim(1) != 2) {
537	537	PyErr_Format(PyExc_ValueError,
538		- "Points must be Nx2 array, got %ldx%ld",
	538	+ "Points must be Nx2 array, got %dx%d",
539	539	points->dim(0), points->dim(1));
540	540	return 0;
541	541	}
@@ -559,7 +559,7 @@ int convert_transforms(PyObject *obj, void *transp)
559	559
560	560	if (trans->dim(1) != 3 || trans->dim(2) != 3) {
561	561	PyErr_Format(PyExc_ValueError,
562		- "Transforms must be Nx3x3 array, got %ldx%ldx%ld",
	562	+ "Transforms must be Nx3x3 array, got %dx%dx%d",
563	563	trans->dim(0), trans->dim(1), trans->dim(2));
564	564	return 0;
565	565	}
@@ -583,7 +583,7 @@ int convert_bboxes(PyObject *obj, void *bboxp)
583	583
584	584	if (bbox->dim(1) != 2 || bbox->dim(2) != 2) {
585	585	PyErr_Format(PyExc_ValueError,
586		- "Bbox array must be Nx2x2 array, got %ldx%ldx%ld",
	586	+ "Bbox array must be Nx2x2 array, got %dx%dx%d",
587	587	bbox->dim(0), bbox->dim(1), bbox->dim(2));
588	588	return 0;
589	589	}
@@ -607,7 +607,7 @@ int convert_colors(PyObject *obj, void *colorsp)
607	607
608	608	if (colors->dim(1) != 4) {
609	609	PyErr_Format(PyExc_ValueError,
610		- "Colors array must be Nx4 array, got %ldx%ld",
	610	+ "Colors array must be Nx4 array, got %dx%d",
611	611	colors->dim(0), colors->dim(1));
612	612	return 0;
613	613	}

0 commit comments

Comments

0 (0)