From ccaa002dd81a6a8bd5acb7a2fa69a2437873c1fd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 25 Sep 2012 19:55:07 +0000 Subject: [PATCH] Fix some linux build warnings Review URL: https://codereview.appspot.com/6571050 git-svn-id: http://skia.googlecode.com/svn/trunk@5675 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrContext.cpp | 7 +++++-- src/gpu/SkGpuDevice.cpp | 1 + tests/ReadPixelsTest.cpp | 3 +++ tests/WritePixelsTest.cpp | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index f35e729..7eb3422 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1388,10 +1388,13 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target, } // Perform any conversions we weren't able to perfom using a scratch texture. if (unpremul || swapRAndB || flipY) { - SkCanvas::Config8888 srcC8888; - SkCanvas::Config8888 dstC8888; + // These are initialized to suppress a warning + SkCanvas::Config8888 srcC8888 = SkCanvas::kNative_Premul_Config8888; + SkCanvas::Config8888 dstC8888 = SkCanvas::kNative_Premul_Config8888; + bool c8888IsValid = grconfig_to_config8888(config, false, &srcC8888); grconfig_to_config8888(config, unpremul, &dstC8888); + if (swapRAndB) { GrAssert(c8888IsValid); // we should only do r/b swap on 8888 configs srcC8888 = swap_config8888_red_and_blue(srcC8888); diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index bcda7d8..4858041 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -300,6 +300,7 @@ GrPixelConfig config8888_to_grconfig_and_flags(SkCanvas::Config8888 config8888, return kRGBA_8888_GrPixelConfig; default: GrCrash("Unexpected Config8888."); + *flags = 0; // suppress warning return kSkia8888_PM_GrPixelConfig; } } diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index 755841e..80ced21 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -93,6 +93,9 @@ SkPMColor convertConfig8888ToPMColor(SkCanvas::Config8888 config8888, g = static_cast(c[1]); b = static_cast(c[2]); break; + default: + SkDEBUGFAIL("Unexpected Config8888"); + return 0; } if (*premul) { r = SkMulDiv255Ceiling(r, a); diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 9c3a5fb..e482fd5 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -190,7 +190,7 @@ SkPMColor convertConfig8888ToPMColor(SkCanvas::Config8888 config8888, break; default: SkDEBUGFAIL("Unexpected Config8888"); - break; + return 0; } if (*premul) { r = SkMulDiv255Ceiling(r, a); -- 2.7.4