aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRami Santina <[email protected]>2011-03-30 15:47:53 +0300
committerRami Santina <[email protected]>2011-03-30 15:47:53 +0300
commit16eded9de9721634a929c9aa829aece0df8fa8a6 (patch)
treeac6aaafa4960b9d83ede23e793e09d31420f6db2
parent81c3642d6cd98a979808c95c27e265d0cc726ed4 (diff)
parentd06d5596d18101c876c869a514e42e795ee9357c (diff)
Merge branch 'master' of ssh://jogamp.org/data/tmp/cache/jogl-turtle2d
-rw-r--r--src/demo/GPURegionRendererListenerBase01.java5
-rw-r--r--src/demo/ReadBufferUtil.java8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/demo/GPURegionRendererListenerBase01.java b/src/demo/GPURegionRendererListenerBase01.java
index 19742a17a..39a920656 100644
--- a/src/demo/GPURegionRendererListenerBase01.java
+++ b/src/demo/GPURegionRendererListenerBase01.java
@@ -27,9 +27,8 @@
*/
package demo;
-import jogamp.graph.curve.opengl.RegionRendererImpl01;
-
import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
import com.jogamp.graph.geom.Vertex;
/**
@@ -48,6 +47,6 @@ public abstract class GPURegionRendererListenerBase01 extends GPURendererListene
OutlineShape outlineShape = null;
public GPURegionRendererListenerBase01(Vertex.Factory<? extends Vertex> factory, int mode, boolean debug, boolean trace) {
- super(new RegionRendererImpl01(factory, mode), debug, trace);
+ super(RegionRenderer.create(factory, mode), debug, trace);
}
} \ No newline at end of file
diff --git a/src/demo/ReadBufferUtil.java b/src/demo/ReadBufferUtil.java
index 1de61974b..9a2da0d7e 100644
--- a/src/demo/ReadBufferUtil.java
+++ b/src/demo/ReadBufferUtil.java
@@ -95,11 +95,13 @@ public class ReadBufferUtil {
}
@SuppressWarnings("deprecation")
- public void dispose() {
+ public void dispose() {
readTexture.dispose();
readTextureData = null;
- readPixelBuffer.clear();
- readPixelBuffer = null;
+ if(null != readPixelBuffer) {
+ readPixelBuffer.clear();
+ readPixelBuffer = null;
+ }
readPixelSizeLast = 0;
}