From f74ad8c91aef4f328dbcbcebae9e436c00a35140 Mon Sep 17 00:00:00 2001
From: "tomhudson@google.com"
 <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Wed, 9 Nov 2011 22:15:08 +0000
Subject: Removes warnings generated by gcc and clang.

git-svn-id: http://skia.googlecode.com/svn/trunk@2651 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 src/core/SkAAClip.cpp   | 4 ++--
 src/gpu/GrAtlas.cpp     | 2 +-
 src/gpu/GrContext.cpp   | 4 ++--
 src/gpu/GrGLProgram.cpp | 4 +++-
 src/gpu/SkGpuDevice.cpp | 8 ++++----
 src/gpu/SkGr.cpp        | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 05742487b8..86d9ae7b08 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -209,7 +209,7 @@ void SkAAClip::validate() const {
         prevOffset = yoff->fOffset;
         const uint8_t* row = head->data() + yoff->fOffset;
         size_t rowLength = compute_row_length(row, fBounds.width());
-        SkASSERT(yoff->fOffset + rowLength <= head->fDataSize);
+        SkASSERT(yoff->fOffset + rowLength <= (size_t) head->fDataSize);
         yoff += 1;
     }
     // check the last entry;
@@ -898,7 +898,7 @@ public:
             size_t n = row->fData->count();
             memcpy(data, row->fData->begin(), n);
 #ifdef SK_DEBUG
-            int bytesNeeded = compute_row_length(data, fBounds.width());
+            size_t bytesNeeded = compute_row_length(data, fBounds.width());
             SkASSERT(bytesNeeded == n);
 #endif
             data += n;
diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 244f69456b..7b88498c15 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -174,7 +174,7 @@ GrAtlas* GrAtlasMgr::addToAtlas(GrAtlas* atlas,
             kNone_GrAALevel,
             GR_ATLAS_TEXTURE_WIDTH,
             GR_ATLAS_TEXTURE_HEIGHT,
-            maskformat2pixelconfig(format)
+            { maskformat2pixelconfig(format) }
         };
         fTexture[format] = fGpu->createTexture(desc, NULL, 0);
         if (NULL == fTexture[format]) {
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 2ccd843839..da26bc6fa6 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1721,7 +1721,7 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
             kRenderTarget_GrTextureFlagBit,
             kNone_GrAALevel,
             width, height,
-            config
+            { config }
         };
         GrAutoScratchTexture ast(this, desc);
         GrTexture* texture = ast.texture();
@@ -1773,7 +1773,7 @@ void GrContext::writePixels(int left, int top, int width, int height,
     this->flush(kForceCurrentRenderTarget_FlushBit);
 
     const GrTextureDesc desc = {
-        kNone_GrTextureFlags, kNone_GrAALevel, width, height, config
+        kNone_GrTextureFlags, kNone_GrAALevel, width, height, { config }
     };
     GrAutoScratchTexture ast(this, desc);
     GrTexture* texture = ast.texture();
diff --git a/src/gpu/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp
index 28e4fc178a..9fe195c340 100644
--- a/src/gpu/GrGLProgram.cpp
+++ b/src/gpu/GrGLProgram.cpp
@@ -1709,7 +1709,7 @@ void GrGLProgram::genStageCode(const GrGLInterface* gl,
 
     };
 
-    const char* swizzle;
+    const char* swizzle = "";
     switch (desc.fSwizzle) {
         case StageDesc::kAlphaSmear_Swizzle:
             swizzle = ".aaaa";
@@ -1720,6 +1720,8 @@ void GrGLProgram::genStageCode(const GrGLInterface* gl,
         case StageDesc::kNone_Swizzle:
             swizzle = "";
             break;
+        default:
+            GrCrash("Swizzle descriptor didn't match any expected value");
     }
 
     GrStringBuilder modulate;
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 8ad951dacd..64d74ee8ab 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -743,7 +743,7 @@ static GrTexture* gaussianBlur(GrContext* context, GrTexture* srcTexture,
         kNone_GrAALevel,
         srcRect.width(),
         srcRect.height(),
-        kRGBA_8888_GrPixelConfig
+        { kRGBA_8888_GrPixelConfig }
     };
 
     temp1->set(context, desc);
@@ -883,7 +883,7 @@ static bool drawWithGPUMaskFilter(GrContext* context, const SkPath& path,
         srcRect.height(),
         // We actually only need A8, but it often isn't supported as a
         // render target
-        kRGBA_8888_PM_GrPixelConfig
+        { kRGBA_8888_PM_GrPixelConfig }
     };
 
     GrAutoScratchTexture pathEntry(context, desc);
@@ -1014,7 +1014,7 @@ static bool drawWithMaskFilter(GrContext* context, const SkPath& path,
         kNone_GrAALevel,
         dstM.fBounds.width(),
         dstM.fBounds.height(),
-        kAlpha_8_GrPixelConfig
+        { kAlpha_8_GrPixelConfig }
     };
 
     GrAutoScratchTexture ast(context, desc);
@@ -1659,7 +1659,7 @@ SkGpuDevice::TexCache SkGpuDevice::lockCachedTexture(const SkBitmap& bitmap,
             kNone_GrAALevel,
             bitmap.width(),
             bitmap.height(),
-            SkGr::Bitmap2PixelConfig(bitmap)
+            { SkGr::Bitmap2PixelConfig(bitmap) }
         };
         GrContext::ScratchTexMatch match;
         if (kSaveLayerDeviceRenderTarget_TexType == type) {
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 6fe8292d0d..6a3941079c 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -76,7 +76,7 @@ GrContext::TextureCacheEntry sk_gr_create_bitmap_texture(GrContext* ctx,
         kNone_GrAALevel,
         bitmap->width(),
         bitmap->height(),
-        SkGr::Bitmap2PixelConfig(*bitmap)
+        { SkGr::Bitmap2PixelConfig(*bitmap) }
     };
 
     if (SkBitmap::kIndex8_Config == bitmap->config()) {
-- 
cgit v1.2.3