Remove compiler warnings (Linux clang, mostly).

Fix indentation.
Remove unnecessary virtual destructor.
codereview.appspot.com/4965043/



git-svn-id: http://skia.googlecode.com/svn/trunk@2171 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tomhudson@google.com 2011-08-25 15:50:54 +00:00
parent 32992605aa
commit 513909f9a2
6 changed files with 6 additions and 6 deletions

View File

@ -36,7 +36,7 @@ public:
return *this;
}
virtual ~GrBinHashKey() {
~GrBinHashKey() {
}
void setKeyData(const uint32_t *data) {

View File

@ -22,7 +22,7 @@
GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
const GrGLInterface* glInterface;
const GrGLInterface* glInterface = NULL;
if (kOpenGL_Shaders_GrEngine == engine ||
kOpenGL_Fixed_GrEngine == engine) {

View File

@ -488,7 +488,7 @@ void append_cmap_sections(const SkTDArray<SkUnichar>& glyphToUnicode,
(i >> 8) == (currentRangeEntry.fStart >> 8) &&
glyphToUnicode[i] == (currentRangeEntry.fUnicode +
continuousEntries)) {
currentRangeEntry.fEnd = i;
currentRangeEntry.fEnd = i;
if (i == glyphToUnicode.count() - 1) {
// Last entry is in a range.
bfrangeEntries.push(currentRangeEntry);

View File

@ -129,7 +129,7 @@ static SkTypeface* find_from_uniqueID(uint32_t uniqueID) {
}
curr = curr->fNext;
}
return false;
return NULL;
}
static bool valid_uniqueID(uint32_t uniqueID) {

View File

@ -130,7 +130,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
*value = n;
return str;
}
return false;
return NULL;
}
const char* SkParse::FindS32(const char str[], int32_t* value)

View File

@ -363,7 +363,7 @@ void SkView::Click::copyType(const char type[])
SkView::Click* SkView::findClickHandler(SkScalar x, SkScalar y)
{
if (x < 0 || y < 0 || x >= fWidth || y >= fHeight) {
return false;
return NULL;
}
if (this->onSendClickToChildren(x, y)) {