AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-attempting Linux debug GL interface compiler complaint fix.

Browse Source 
Fixed two additional compiler complaints.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3456 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-03-21 19:46:50 +00:00
parent f6f123d236
commit 6970557055
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkPaint.h
View File

@ -696,7 +696,7 @@ public:
enum TextEncoding {
kUTF8_TextEncoding, //!< the text parameters are UTF8
kUTF16_TextEncoding, //!< the text parameters are UTF16
kUTF32_TextEncoding, //!< teh text parameters are UTF32
kUTF32_TextEncoding, //!< the text parameters are UTF32
kGlyphID_TextEncoding //!< the text parameters are glyph indices
};

6
src/gpu/GrInOrderDrawBuffer.cpp
View File

@ -21,12 +21,12 @@ GrInOrderDrawBuffer::GrInOrderDrawBuffer(const GrGpu* gpu,
GrIndexBufferAllocPool* indexPool)
: fAutoFlushTarget(NULL)
, fClipSet(true)
, fVertexPool(*vertexPool)
, fIndexPool(*indexPool)
, fLastRectVertexLayout(0)
, fQuadIndexBuffer(NULL)
, fMaxQuads(0)
, fCurrQuad(0)
, fVertexPool(*vertexPool)
, fIndexPool(*indexPool) {
, fCurrQuad(0) {
fCaps = gpu->getCaps();

6
src/gpu/gl/GrGLCreateDebugInterface.cpp
View File

@ -122,7 +122,7 @@ public:
GrAlwaysAssert(size >= 0);
// delete pre-existing data
delete fDataPtr;
delete[] fDataPtr;
fSize = size;
fDataPtr = new GrGLchar[size];
@ -132,7 +132,7 @@ public:
// TODO: w/ no dataPtr the data is unitialized - this could be tracked
}
GrGLint getSize() const { return fSize; }
GrGLvoid *getDataPtr() { return fDataPtr; }
GrGLchar *getDataPtr() { return fDataPtr; }
GrGLint getUsage() const { return fUsage; }
void setUsage(GrGLint usage) { fUsage = usage; }
@ -494,7 +494,7 @@ GrDebugGL GrDebugGL::Obj;
////////////////////////////////////////////////////////////////////////////////
GrGLvoid GR_GL_FUNCTION_TYPE debugGLActiveTexture(GrGLenum texture) {
GrAlwaysAssert(0 <= texture);
// GrAlwaysAssert(0 <= texture);
// GrAlwaysAssert(texture < GrDebugGL::getInstance()->getMaxTextureUnits());
GrDebugGL::getInstance()->setCurTextureUnit(texture);

8
src/utils/SkDumpCanvas.cpp
View File

@ -138,9 +138,17 @@ static void toString(const void* text, size_t len, SkPaint::TextEncoding enc,
str->printf("\"%.*S\"%s", SkMax32(len, 32), text,
len > 64 ? "..." : "");
break;
case SkPaint::kUTF32_TextEncoding:
str->printf("\"%.*S\"%s", SkMax32(len, 32), text,
len > 128 ? "..." : "");
break;
case SkPaint::kGlyphID_TextEncoding:
str->set("<glyphs>");
break;
default:
SkASSERT(false);
break;
}
}