Merge remote-tracking branch 'hharrison/master'

1 files changed, 26 insertions, 26 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLStateTracker.java b/src/jogl/classes/jogamp/opengl/GLStateTracker.java
index 01c3716e0..307fd0a15 100644
--- a/src/jogl/classes/jogamp/opengl/GLStateTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLStateTracker.java
@@ -1,21 +1,21 @@
 /*
  * Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  * - Redistribution of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  * - Redistribution in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * 
+ *
  * Neither the name of Sun Microsystems, Inc. or the names of
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * This software is provided "AS IS," without a warranty of any kind. ALL
  * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
  * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
@@ -28,11 +28,11 @@
  * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
+ *
  * You acknowledge that this software is not designed or intended for use
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
- * 
+ *
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
@@ -53,47 +53,47 @@ import java.util.ArrayList;
  * Currently supported states: PixelStorei
  */
 public class GLStateTracker {
-    
-  /** Minimum value of MAX_CLIENT_ATTRIB_STACK_DEPTH */  
+
+  /** Minimum value of MAX_CLIENT_ATTRIB_STACK_DEPTH */
   public static final int MIN_CLIENT_ATTRIB_STACK_DEPTH = 16;
-  
+
   /** static size of pixel state map */
   static final int PIXEL_STATE_MAP_SIZE = 16;
   /** avoid rehash of static size pixel state map */
   static final int PIXEL_STATE_MAP_CAPACITY = 32;
-  
+
   private volatile boolean enabled = true;
 
   private IntIntHashMap pixelStateMap;
   private final ArrayList<SavedState> stack;
-  
+
   private static class SavedState {
 
     /**
      * Empty pixel-store state
-     */ 
+     */
     private IntIntHashMap pixelStateMap;
-    
+
     /**
      * set (client) pixel-store state, deep copy
-     */ 
+     */
     private final void setPixelStateMap(IntIntHashMap pixelStateMap) {
         this.pixelStateMap = (IntIntHashMap) pixelStateMap.clone();
     }
-    
+
     /**
      * get (client) pixel-store state, return reference
-     */ 
+     */
     private final IntIntHashMap getPixelStateMap() { return pixelStateMap; }
 
   }
-  
 
-  public GLStateTracker() {    
+
+  public GLStateTracker() {
     pixelStateMap = new IntIntHashMap(PIXEL_STATE_MAP_CAPACITY, 0.75f);
     pixelStateMap.setKeyNotFoundValue(0xFFFFFFFF);
     resetStates();
-    
+
     stack = new ArrayList<SavedState>(MIN_CLIENT_ATTRIB_STACK_DEPTH);
   }
 
@@ -102,18 +102,18 @@ public class GLStateTracker {
   }
 
   public final void setEnabled(boolean on) {
-    enabled = on;    
+    enabled = on;
   }
 
   public final boolean isEnabled() {
     return enabled;
   }
 
-  /** @return true if found in our map, otherwise false, 
+  /** @return true if found in our map, otherwise false,
    *  which forces the caller to query GL. */
   public final boolean getInt(int pname, int[] params, int params_offset) {
     if(enabled) {
-        final int value = pixelStateMap.get(pname);        
+        final int value = pixelStateMap.get(pname);
         if(0xFFFFFFFF != value) {
             params[params_offset] = value;
             return true;
@@ -122,7 +122,7 @@ public class GLStateTracker {
     return false;
   }
 
-  /** @return true if found in our map, otherwise false, 
+  /** @return true if found in our map, otherwise false,
    *  which forces the caller to query GL. */
   public final boolean getInt(int pname, IntBuffer params, int dummy) {
     if(enabled) {
@@ -158,7 +158,7 @@ public class GLStateTracker {
             throw new GLException("stack contains no elements");
         }
         SavedState state = stack.remove(stack.size()-1); // pop
-        
+
         if(null==state) {
             throw new GLException("null stack element (remaining stack size "+stack.size()+")");
         }
@@ -166,7 +166,7 @@ public class GLStateTracker {
         if ( null != state.getPixelStateMap() ) {
             // use pulled client pixel-store state from stack
             pixelStateMap = state.getPixelStateMap();
-        } // else: empty-slot, not pushed by GL_CLIENT_PIXEL_STORE_BIT        
+        } // else: empty-slot, not pushed by GL_CLIENT_PIXEL_STORE_BIT
     }
   }