diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 18:49:15 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-15 18:49:15 +0000 |
| commit | 60abb078e5597c9c6ceaba1ef495c4916ff4df0d (patch) | |
| tree | 7d982af583e3fdba330097f4d3597a4006493ad6 /src/opts | |
| parent | 278dc6929b6481204874dcfcc055e2aaa30a95b2 (diff) | |
Merge changes from the android repo upstream to Skia
Review URL: https://codereview.appspot.com/5545070
git-svn-id: http://skia.googlecode.com/svn/trunk@3199 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp index 761bf7437b..20a82c8816 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -988,7 +988,7 @@ static void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst, /* calculate 'd', which will be 0..7 */ /* dbase[] is 0..7; alpha is 0..256; 16 bits suffice */ -#if SK_BUILD_FOR_ANDROID +#if defined(SK_BUILD_FOR_ANDROID) /* SkAlpha255To256() semantic a+1 vs a+a>>7 */ alpha8 = vaddw_u8(vmovl_u8(sa), vdup_n_u8(1)); #else |