| Index: src/core/SkBitmapProcState_shaderproc.h
|
| diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h
|
| index b1fdc5f0562a373a399924e22f269c38a973d1cc..d41ff063e4dab72716ecb3be4e35c97f84c68678 100644
|
| --- a/src/core/SkBitmapProcState_shaderproc.h
|
| +++ b/src/core/SkBitmapProcState_shaderproc.h
|
| @@ -1,4 +1,3 @@
|
| -
|
| /*
|
| * Copyright 2011 Google Inc.
|
| *
|
| @@ -12,11 +11,9 @@
|
|
|
| // Can't be static in the general case because some of these implementations
|
| // will be defined and referenced in different object files.
|
| -void SCALE_FILTER_NAME(const void* sIn, int x, int y,
|
| - DSTTYPE* SK_RESTRICT colors, int count);
|
| +void SCALE_FILTER_NAME(const void* sIn, int x, int y, SkPMColor* SK_RESTRICT colors, int count);
|
|
|
| -void SCALE_FILTER_NAME(const void* sIn, int x, int y,
|
| - DSTTYPE* SK_RESTRICT colors, int count) {
|
| +void SCALE_FILTER_NAME(const void* sIn, int x, int y, SkPMColor* SK_RESTRICT colors, int count) {
|
| const SkBitmapProcState& s = *static_cast<const SkBitmapProcState*>(sIn);
|
| SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
|
| SkMatrix::kScale_Mask)) == 0);
|
| @@ -85,7 +82,6 @@ void SCALE_FILTER_NAME(const void* sIn, int x, int y,
|
| #undef TILEY_LOW_BITS
|
| #undef MAKENAME
|
| #undef SRCTYPE
|
| -#undef DSTTYPE
|
| #undef CHECKSTATE
|
| #undef SRC_TO_FILTER
|
| #undef FILTER_TO_DST
|
|
|