From 6b2f7ea7f470bd50dc69d331097a647ec03f8070 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 14 Mar 2012 20:00:42 +0000 Subject: [PATCH] tweak gm bounds to better fit the content remove assert that is too strict if the src is the dst of a prev draw (where alpha might be 0xFE, even if it *should* be 0xFF) git-svn-id: http://skia.googlecode.com/svn/trunk@3388 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/tablecolorfilter.cpp | 2 +- src/core/SkBlitRow_D4444.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index df33337..7f0a623 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -99,7 +99,7 @@ protected: } virtual SkISize onISize() { - return SkISize::Make(640, 480); + return SkISize::Make(700, 300); } virtual void onDraw(SkCanvas* canvas) { diff --git a/src/core/SkBlitRow_D4444.cpp b/src/core/SkBlitRow_D4444.cpp index d66d2b7..3a92a6b 100644 --- a/src/core/SkBlitRow_D4444.cpp +++ b/src/core/SkBlitRow_D4444.cpp @@ -102,7 +102,6 @@ static void S32_D4444_Opaque_Dither(uint16_t* SK_RESTRICT dst, do { SkPMColor c = *src++; SkPMColorAssert(c); - SkASSERT(SkGetPackedA32(c) == 255); unsigned dither = DITHER_VALUE(x); *dst++ = SkDitherARGB32To4444(c, dither); -- 2.7.4