commit f74ad8c91aef4f328dbcbcebae9e436c00a35140
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 09 22:15:08 2011 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 09 22:15:08 2011 +0000
tree 0acc3d6ba630a5efca8f1b7bcd60e6c051634381
parent 5a5c2ab3a8cc9cea94bcd883fd983512314a2ef3

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

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 0574248..86d9ae7 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -209,7 +209,7 @@
         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 @@
             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;

src/gpu/GrAtlas.cpp

diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 244f694..7b88498 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -174,7 +174,7 @@
             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]) {

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 2ccd843..da26bc6 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1721,7 +1721,7 @@
             kRenderTarget_GrTextureFlagBit,
             kNone_GrAALevel,
             width, height,
-            config
+            { config }
         };
         GrAutoScratchTexture ast(this, desc);
         GrTexture* texture = ast.texture();
@@ -1773,7 +1773,7 @@
     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();

src/gpu/GrGLProgram.cpp

diff --git a/src/gpu/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp
index 28e4fc1..9fe195c 100644
--- a/src/gpu/GrGLProgram.cpp
+++ b/src/gpu/GrGLProgram.cpp
@@ -1709,7 +1709,7 @@
 
     };
 
-    const char* swizzle;
+    const char* swizzle = "";
     switch (desc.fSwizzle) {
         case StageDesc::kAlphaSmear_Swizzle:
             swizzle = ".aaaa";
@@ -1720,6 +1720,8 @@
         case StageDesc::kNone_Swizzle:
             swizzle = "";
             break;
+        default:
+            GrCrash("Swizzle descriptor didn't match any expected value");
     }
 
     GrStringBuilder modulate;

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 8ad951d..64d74ee 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -743,7 +743,7 @@
         kNone_GrAALevel,
         srcRect.width(),
         srcRect.height(),
-        kRGBA_8888_GrPixelConfig
+        { kRGBA_8888_GrPixelConfig }
     };
 
     temp1->set(context, desc);
@@ -883,7 +883,7 @@
         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 @@
         kNone_GrAALevel,
         dstM.fBounds.width(),
         dstM.fBounds.height(),
-        kAlpha_8_GrPixelConfig
+        { kAlpha_8_GrPixelConfig }
     };
 
     GrAutoScratchTexture ast(context, desc);
@@ -1659,7 +1659,7 @@
             kNone_GrAALevel,
             bitmap.width(),
             bitmap.height(),
-            SkGr::Bitmap2PixelConfig(bitmap)
+            { SkGr::Bitmap2PixelConfig(bitmap) }
         };
         GrContext::ScratchTexMatch match;
         if (kSaveLayerDeviceRenderTarget_TexType == type) {

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 6fe8292..6a39410 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -76,7 +76,7 @@
         kNone_GrAALevel,
         bitmap->width(),
         bitmap->height(),
-        SkGr::Bitmap2PixelConfig(*bitmap)
+        { SkGr::Bitmap2PixelConfig(*bitmap) }
     };
 
     if (SkBitmap::kIndex8_Config == bitmap->config()) {