diff options
| author | Kevin Rushforth <[email protected]> | 2006-10-16 21:38:21 +0000 |
|---|---|---|
| committer | Kevin Rushforth <[email protected]> | 2006-10-16 21:38:21 +0000 |
| commit | c1170b05f70db02dd274972fb95c8beb4bbf1a04 (patch) | |
| tree | aa9b0f5719aed0fe02bf776daf4e024701d4a786 | |
| parent | 493d0b1e80e30b30311a82492ebc27c022c5a7be (diff) | |
. Fixed Issue 355: IndexedXXXStripArray throws NPE with ByRef Indices
. Remove debug print statement from NoopPipeline
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@720 ba19aa83-45c5-6ac9-afd3-db810772062c
| -rw-r--r-- | src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java | 12 | ||||
| -rw-r--r-- | src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java index e53565b..fe9c283 100644 --- a/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java +++ b/src/classes/share/javax/media/j3d/IndexedGeometryArrayRetained.java @@ -1611,11 +1611,13 @@ abstract class IndexedGeometryArrayRetained extends GeometryArrayRetained { int computeMaxIndex(int initial, int count, int[] indices) { int maxIndex = 0; - for (int i = initial; i < (initial+count); i++) { - if (indices[i] > maxIndex) { - maxIndex = indices[i]; - } - } + if (indices != null) { + for (int i = initial; i < (initial+count); i++) { + if (indices[i] > maxIndex) { + maxIndex = indices[i]; + } + } + } return maxIndex; } diff --git a/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java b/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java index 5fb3c01..f647094 100644 --- a/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java +++ b/src/classes/share/javax/media/j3d/NoopDrawingSurfaceObject.java @@ -24,13 +24,13 @@ class NoopDrawingSurfaceObject extends DrawingSurfaceObject { } synchronized boolean renderLock() { - System.err.println("NoopDrawingSurfaceObject.renderLock()"); +// System.err.println("NoopDrawingSurfaceObject.renderLock()"); gotDsiLock = true; return true; } synchronized void unLock() { - System.err.println("NoopDrawingSurfaceObject.unLock()"); +// System.err.println("NoopDrawingSurfaceObject.unLock()"); gotDsiLock = false; } |