Merge pull request #5981 from Minimaximize/Liam/Processing-Fix-Array-… · eggfly/processing@0ac37bc · GitHub

1. eggfly
2. processing

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 0ac37bc

Browse filesBrowse the repository at this point in the historyBrowse files

benfry

authored

Merge pull request processing#5981 from Minimaximize/Liam/Processing-Fix-Array-Declaration

Replace C/C++ style array declarations with Java style array declarations

2 parents 83fe79d + f923be3 commit 0ac37bc
Copy full SHA for 0ac37bc

14 files changed

+303-319Lines changed: 303 additions & 319 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• core/src/processing
  • awt
    • PGraphicsJava2D.java
  • core
    • PApplet.java
    • PFont.java
    • PGraphics.java
    • PImage.java
    • PMatrix2D.java
    • PShapeOBJ.java
    • PShapeSVG.java
  • data
    • Table.java
  • javafx
    • PGraphicsFX2D.java
  • opengl
    • LinePath.java
    • PGL.java
    • PGraphicsOpenGL.java
    • PJOGL.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎core/src/processing/awt/PGraphicsJava2D.java‎

Copy file name to clipboardExpand all lines: core/src/processing/awt/PGraphicsJava2D.java

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

Original file line number	Diff line number	Diff line change
@@ -82,7 +82,7 @@ public class PGraphicsJava2D extends PGraphics {
82	82	float[] curveDrawY;
83	83
84	84	int transformCount;
85		- AffineTransform transformStack[] =
	85	+ AffineTransform[] transformStack =
86	86	new AffineTransform[MATRIX_STACK_DEPTH];
87	87	double[] transform = new double[6];
88	88
@@ -782,7 +782,7 @@ public void vertex(float x, float y) {
782	782	//float vertex[];
783	783
784	784	if (vertexCount == vertices.length) {
785		- float temp[][] = new float[vertexCount<<1][VERTEX_FIELD_COUNT];
	785	+ float[][] temp = new float[vertexCount<<1][VERTEX_FIELD_COUNT];
786	786	System.arraycopy(vertices, 0, temp, 0, vertexCount);
787	787	vertices = temp;
788	788	//message(CHATTER, "allocating more vertices " + vertices.length);
@@ -1959,7 +1959,7 @@ protected void handleTextSize(float size) {
1959	1959
1960	1960
1961	1961	@Override
1962		- protected float textWidthImpl(char buffer[], int start, int stop) {
	1962	+ protected float textWidthImpl(char[] buffer, int start, int stop) {
1963	1963	if (textFont == null) {
1964	1964	defaultFontOrDeath("textWidth");
1965	1965	}
@@ -2028,7 +2028,7 @@ protected float textWidthImpl(char buffer[], int start, int stop) {
2028	2028
2029	2029
2030	2030	@Override
2031		- protected void textLineImpl(char buffer[], int start, int stop,
	2031	+ protected void textLineImpl(char[] buffer, int start, int stop,
2032	2032	float x, float y) {
2033	2033	Font font = (Font) textFont.getNative();
2034	2034	// if (font != null && (textFont.isStream() || hints[ENABLE_NATIVE_FONTS])) {
@@ -2828,7 +2828,7 @@ public void updatePixels(int x, int y, int c, int d) {
2828	2828	// GET/SET
2829	2829
2830	2830
2831		- static int getset[] = new int[1];
	2831	+ static int[] getset = new int[1];
2832	2832
2833	2833
2834	2834	@Override

0 commit comments

Comments

0 (0)