commit 2badb15d437d14d426f7466d855055c613a7a613
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 12:26:18 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 12:26:18 2012 +0000
tree edba91a70d6abbc2c7bce0dcc53b164984a18ab4
parent 56d3a23c3e0a53777fb25898951718d44dd9c027

Partial re-delivery of Linux compiler complaint changes.
Was originally delivered as r3428 but was backed out due to pixel diffs on Mac mini.

http://codereview.appspot.com/5845068/



git-svn-id: http://skia.googlecode.com/svn/trunk@3447 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 3b2a376..2c240b3 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);