diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-23 20:46:31 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-23 20:46:31 +0000 |
| commit | 57f4969724a1dd88c8d9ae35a863e6cf621181d5 (patch) | |
| tree | cb1c377ea38c512e380b21d8d767c4497142f5a8 /src/images/SkFlipPixelRef.cpp | |
| parent | 819c921b0445fa9f45f18d4a560603cd9fde6ba4 (diff) | |
merge from android tree:
- optional parameters added to descriptorProc and allocPixels
- clip options to image decoders
- check for xfermode in blitter_a8
- UNROLL loops in blitrow
reviewed by reed@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@841 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images/SkFlipPixelRef.cpp')
| -rw-r--r-- | src/images/SkFlipPixelRef.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/images/SkFlipPixelRef.cpp b/src/images/SkFlipPixelRef.cpp index 8d0f15a703..39e1a1205a 100644 --- a/src/images/SkFlipPixelRef.cpp +++ b/src/images/SkFlipPixelRef.cpp @@ -74,8 +74,8 @@ SkPixelRef* SkFlipPixelRef::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkFlipPixelRef, (buffer)); } -static SkPixelRef::Registrar::Registrar reg("SkFlipPixelRef", - SkFlipPixelRef::Create); +static SkPixelRef::Registrar reg("SkFlipPixelRef", + SkFlipPixelRef::Create); /////////////////////////////////////////////////////////////////////////////// @@ -125,4 +125,3 @@ void SkFlipPixelRef::CopyBitsFromAddr(const SkBitmap& dst, const SkRegion& clip, iter.next(); } } - |