AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix skia bug 2845

Browse Source 
Shouldn't call Fast Blur path(DoubleRowBoxBlur_NEON)
when kernelsize is 1. Or, uint16x8_t resultPixels will be overflow.

BUG=skia:2845
R=senorblanco@chromium.org

Review URL: https://codereview.chromium.org/587543003
This commit is contained in:
kui.zheng 2015-02-17 08:01:52 -08:00 committed by Commit bot
parent b197b8ff31
commit b1629c5d9e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/opts/SkBlitRow_opts_arm_neon.cpp
View File

@ -1778,8 +1778,7 @@ const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm_neon[] = {
#if 0 #if 0
S32A_D565_Blend_neon, S32A_D565_Blend_neon,
#else #else
NULL, // https://code.google.com/p/skia/issues/detail?id=2845 NULL, // https://code.google.com/p/skia/issues/detail?id=2797
// https://code.google.com/p/skia/issues/detail?id=2797
#endif #endif
// dither // dither

3
src/opts/SkBlurImage_opts_arm.cpp
View File

@ -12,9 +12,6 @@ bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX,
SkBoxBlurProc* boxBlurY, SkBoxBlurProc* boxBlurY,
SkBoxBlurProc* boxBlurXY, SkBoxBlurProc* boxBlurXY,
SkBoxBlurProc* boxBlurYX) { SkBoxBlurProc* boxBlurYX) {
// Temporary workaround for http://skbug.com/2845
return false;
#if SK_ARM_NEON_IS_NONE #if SK_ARM_NEON_IS_NONE
return false; return false;
#else #else

2
src/opts/SkBlurImage_opts_neon.cpp
View File

@ -123,7 +123,7 @@ void SkBoxBlur_NEON(const SkPMColor* src, int srcStride, SkPMColor* dst, int ker
const uint32x4_t scale = vdupq_n_u32((1 << 24) / kernelSize); const uint32x4_t scale = vdupq_n_u32((1 << 24) / kernelSize);
const uint32x4_t half = vdupq_n_u32(1 << 23); const uint32x4_t half = vdupq_n_u32(1 << 23);
if (kernelSize < 128) if (1 < kernelSize && kernelSize < 128)
{ {
SkDoubleRowBoxBlur_NEON<srcDirection, dstDirection>(&src, srcStride, &dst, kernelSize, SkDoubleRowBoxBlur_NEON<srcDirection, dstDirection>(&src, srcStride, &dst, kernelSize,
leftOffset, rightOffset, width, &height); leftOffset, rightOffset, width, &height);