aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-01 15:41:22 -0800
committerAndroid Code Review <code-review@android.com>2010-12-01 15:41:22 -0800
commit65083ff56da4a09341dcff3dc8ae4c02a4831def (patch)
treea69130cb4b67ff0f172992da82d0dcc0e5c485b0
parentf610b3352155a903c7510e9e3a0cb0238419f7d5 (diff)
parentec0c72cdf4891b8e72c34f5a124459ecd44e3e22 (diff)
downloadskia-65083ff56da4a09341dcff3dc8ae4c02a4831def.tar.gz
Merge "Fix compilation errors:"tools_r9tools_r8froyo-plus-aosp
-rw-r--r--src/images/SkFlipPixelRef.cpp4
-rw-r--r--src/images/SkImageRef_GlobalPool.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/images/SkFlipPixelRef.cpp b/src/images/SkFlipPixelRef.cpp
index 8d0f15a703..6f96b03ba2 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);
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/images/SkImageRef_GlobalPool.cpp b/src/images/SkImageRef_GlobalPool.cpp
index 1f0bc4306b..33a3c46eaf 100644
--- a/src/images/SkImageRef_GlobalPool.cpp
+++ b/src/images/SkImageRef_GlobalPool.cpp
@@ -50,8 +50,8 @@ SkPixelRef* SkImageRef_GlobalPool::Create(SkFlattenableReadBuffer& buffer) {
return SkNEW_ARGS(SkImageRef_GlobalPool, (buffer));
}
-static SkPixelRef::Registrar::Registrar reg("SkImageRef_GlobalPool",
- SkImageRef_GlobalPool::Create);
+static SkPixelRef::Registrar reg("SkImageRef_GlobalPool",
+ SkImageRef_GlobalPool::Create);
///////////////////////////////////////////////////////////////////////////////
// global imagerefpool wrappers