diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrContext.cpp | 7 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index f35e729e24..7eb3422d2c 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 bcda7d8001..485804167a 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; } } |