commit 0ffc56f6745e3c5d9a9baa15a3259da5fea0f88a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 13:05:04 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 13:05:04 2012 +0000
tree 3f219200c6976d09d215d11251e3b5719e508aea
parent 2badb15d437d14d426f7466d855055c613a7a613

Reverting Linux compiler complaint patch - again




git-svn-id: http://skia.googlecode.com/svn/trunk@3448 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLCreateDebugInterface.cpp

diff --git a/src/gpu/gl/GrGLCreateDebugInterface.cpp b/src/gpu/gl/GrGLCreateDebugInterface.cpp
index 2c240b3..3b2a376 100644
--- a/src/gpu/gl/GrGLCreateDebugInterface.cpp
+++ b/src/gpu/gl/GrGLCreateDebugInterface.cpp
@@ -100,7 +100,7 @@
         GrAlwaysAssert(size >= 0);
 
         // delete pre-existing data
-        delete[] fDataPtr;
+        delete fDataPtr;
 
         fSize = size;
         fDataPtr = new char[size];
@@ -345,7 +345,7 @@
 GrGLvoid GR_GL_FUNCTION_TYPE debugGLActiveTexture(GrGLenum texture) 
 {
     
-//    GrAlwaysAssert(0 <= texture);
+    GrAlwaysAssert(0 <= texture);
 //    GrAlwaysAssert(texture < GrDebugGL::getInstance()->getMaxTextureUnits());
 
     GrDebugGL::getInstance()->setCurTextureUnit(texture);