eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4520 from inkwellsiesta/master

Browse Source 
added a check for length 0 arrays in expand()
This commit is contained in:
Ben Fry
2016-06-02 16:15:19 -04:00
parent c6b9afbd02 c6f11b3aaa
commit 1a5eb92612
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/core/PApplet.java
+11 -10
View File
@@ -1870,7 +1870,7 @@ public class PApplet implements PConstants {
/**
* @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN)
* @param display the screen to run the sketch on (1, 2, 3, etc. or on multiple screens using SPAN)
*/
public void fullScreen(String renderer, int display) {
@@ -7842,7 +7842,7 @@ public class PApplet implements PConstants {
* @see PApplet#shorten(boolean[])
*/
static public boolean[] expand(boolean list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
/**
@@ -7855,7 +7855,7 @@ public class PApplet implements PConstants {
}
static public byte[] expand(byte list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public byte[] expand(byte list[], int newSize) {
@@ -7865,7 +7865,7 @@ public class PApplet implements PConstants {
}
static public char[] expand(char list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public char[] expand(char list[], int newSize) {
@@ -7875,7 +7875,7 @@ public class PApplet implements PConstants {
}
static public int[] expand(int list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public int[] expand(int list[], int newSize) {
@@ -7885,7 +7885,7 @@ public class PApplet implements PConstants {
}
static public long[] expand(long list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public long[] expand(long list[], int newSize) {
@@ -7895,7 +7895,7 @@ public class PApplet implements PConstants {
}
static public float[] expand(float list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public float[] expand(float list[], int newSize) {
@@ -7905,7 +7905,7 @@ public class PApplet implements PConstants {
}
static public double[] expand(double list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public double[] expand(double list[], int newSize) {
@@ -7915,7 +7915,7 @@ public class PApplet implements PConstants {
}
static public String[] expand(String list[]) {
return expand(list, list.length << 1);
return expand(list, list.length > 0 ? list.length << 1 : 1);
}
static public String[] expand(String list[], int newSize) {
@@ -7929,7 +7929,8 @@ public class PApplet implements PConstants {
* @nowebref
*/
static public Object expand(Object array) {
return expand(array, Array.getLength(array) << 1);
int len = Array.getLength(array);
return expand(array, len > 0 ? len << 1 : 1);
}
static public Object expand(Object list, int newSize) {