From fb2ad3f323c617c00e402833f175753a6c238f0a Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 12 Nov 2014 00:22:24 +0000
Subject: [PATCH] Changed a few GL_TYPE -> GL_TYPE_NM to remove ambiguity

---
 wrap/gl/pick.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrap/gl/pick.h b/wrap/gl/pick.h
index 8edd4336..404d6ae4 100644
--- a/wrap/gl/pick.h
+++ b/wrap/gl/pick.h
@@ -212,7 +212,7 @@ public:
     int screenH = (int)(vp[3]-vp[1]);
 
     GL_TYPE_NM<Scalarm>::ScalarType *buffer = new GL_TYPE_NM<Scalarm>::ScalarType[screenW*screenH];
-    
+
     //I'm not sure glReadPixels can accept GL_DOUBLE tag
     //GLenum err = glGetError();
     glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM<Scalarm>::SCALAR(),buffer);
@@ -254,11 +254,11 @@ public:
         int screenH = 		vp[3]-vp[1];
 
 
-        GL_TYPE<Scalarm>::ScalarType *buffer = new GL_TYPE<Scalarm>::ScalarType[screenW*screenH];
+        GL_TYPE_NM<Scalarm>::ScalarType *buffer = new GL_TYPE_NM<Scalarm>::ScalarType[screenW*screenH];
 
         //I'm not sure glReadPixels can accept GL_DOUBLE tag
         //GLenum err = glGetError();
-        glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE<Scalarm>::SCALAR(),buffer);
+        glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM<Scalarm>::SCALAR(),buffer);
         //err = glGetError();
 
         std::vector<FacePointer> result;