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

Remove a few old uses of SK_RESTRICT on references.

Browse Source 
Conditionally #defines SK_RESTRICT to be __restrict on Win32;
this successfully compiles in VS2008.



git-svn-id: http://skia.googlecode.com/svn/trunk@1841 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tomhudson@google.com 2011-07-12 19:19:03 +00:00
parent adec446b75
commit 333d6cb244
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkPreConfig.h
View File

@ -62,7 +62,9 @@
#endif
#ifdef SK_BUILD_FOR_WIN32
#define SK_RESTRICT
#if !defined(SK_RESTRICT)
#define SK_RESTRICT __restrict
#endif
#include "sk_stdint.h"
#endif

12
src/core/SkBlitter_RGB16.cpp
View File

@ -210,8 +210,8 @@ static inline black_8_pixels(U8CPU mask, uint16_t dst[])
#define SK_BLITBWMASK_DEVTYPE uint16_t
#include "SkBlitBWMaskTemplate.h"
void SkRGB16_Black_Blitter::blitMask(const SkMask& SK_RESTRICT mask,
const SkIRect& SK_RESTRICT clip) {
void SkRGB16_Black_Blitter::blitMask(const SkMask& mask,
const SkIRect& clip) {
if (mask.fFormat == SkMask::kBW_Format) {
SkRGB16_Black_BlitBW(fDevice, mask, clip);
} else {
@ -378,8 +378,8 @@ static U16CPU blend_compact(uint32_t src32, uint32_t dst32, unsigned scale5) {
return SkCompact_rgb_16(dst32 + ((src32 - dst32) * scale5 >> 5));
}
void SkRGB16_Opaque_Blitter::blitMask(const SkMask& SK_RESTRICT mask,
const SkIRect& SK_RESTRICT clip) {
void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
const SkIRect& clip) {
if (mask.fFormat == SkMask::kBW_Format) {
SkRGB16_BlitBW(fDevice, mask, clip, fColor16);
return;
@ -638,8 +638,8 @@ static inline void blend_8_pixels(U8CPU bw, uint16_t dst[], unsigned dst_scale,
#define SK_BLITBWMASK_DEVTYPE uint16_t
#include "SkBlitBWMaskTemplate.h"
void SkRGB16_Blitter::blitMask(const SkMask& SK_RESTRICT mask,
const SkIRect& SK_RESTRICT clip) {
void SkRGB16_Blitter::blitMask(const SkMask& mask,
const SkIRect& clip) {
if (mask.fFormat == SkMask::kBW_Format) {
SkRGB16_BlendBW(fDevice, mask, clip, 256 - fScale, fColor16);
return;