xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #358 Fixed merge errors when merging core_exp into ss_sync

Browse source 
Former-commit-id: 9b0d01f8b5 [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 07cf5069ba
Former-commit-id: 993cac891e
This commit is contained in:
Max Schenkelberg 2012-03-30 10:51:31 -05:00
parent 9fee09c9e4
commit f20e674318
5 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
View file

@ -50,12 +50,6 @@ public interface IGLTarget extends IGraphicsTarget {
*/ */
public abstract void releaseContext(); public abstract void releaseContext();
/**
*
* @return
*/
public abstract void releaseContext();
/** /**
* Get the modle view matrix settings * Get the modle view matrix settings
* *

3
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
View file

@ -219,6 +219,7 @@ public abstract class AbstractGLImage implements IImage {
rbuf = null; rbuf = null;
} }
throw new VizException(errorMessage); throw new VizException(errorMessage);
}
} }
/* /*
@ -261,8 +262,10 @@ public abstract class AbstractGLImage implements IImage {
GL.GL_NEAREST); GL.GL_NEAREST);
} }
return true; return true;
}
return false; return false;
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
* *

3
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
View file

@ -203,9 +203,6 @@ public class GLCMTextureData implements IImageCacheable {
public double getValue(int x, int y) { public double getValue(int x, int y) {
if (!isStaged() && isLoaded()) { if (!isStaged() && isLoaded()) {
GL gl = GLU.getCurrentGL(); GL gl = GLU.getCurrentGL();
if (gl == null || data == null) {
return Double.NaN;
}
int textureStorageType = getTextureStorageType(); int textureStorageType = getTextureStorageType();
int copybackTextureType = data.getCopyBackTextureType(); int copybackTextureType = data.getCopyBackTextureType();
Buffer copybackBuffer = data.getCopybackBuffer(); Buffer copybackBuffer = data.getCopybackBuffer();

1
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
View file

@ -552,7 +552,6 @@ public class GLTarget implements IGLTarget {
theContext.destroyContext(); theContext.destroyContext();
if (theCanvas != null && theCanvas.isDisposed() == false) { if (theCanvas != null && theCanvas.isDisposed() == false) {
theCanvas.removeListener(SWT.Resize, this.canvasResizeListener); theCanvas.removeListener(SWT.Resize, this.canvasResizeListener);
} }
extensionManager.dispose(); extensionManager.dispose();

3
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
View file

@ -846,8 +846,7 @@ public class RadarGraphicFunctions {
} }
private static Document loadSVG(String plotModelFile) throws VizException { private static Document loadSVG(String plotModelFile) throws VizException {
Document document = null; Document document = docMap.get(plotModelFile);
// document = docMap.get(plotModelFile);
if (document == null) { if (document == null) {
String parser = XMLResourceDescriptor.getXMLParserClassName(); String parser = XMLResourceDescriptor.getXMLParserClassName();