[PATCH-Android] [android/external/skia] Modified to avoid build errors using GCC 4.5/4.6.

Signed-off-by: Sachin Kamat sachin.kamat@linaro.org

Change-Id: Ibebec39dfd1e083a052870927a4129fdeca7cf8a --- src/images/SkFlipPixelRef.cpp | 2 +- src/images/SkImageRef_GlobalPool.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/images/SkFlipPixelRef.cpp b/src/images/SkFlipPixelRef.cpp index 8d0f15a..bdf4d0a 100644 --- a/src/images/SkFlipPixelRef.cpp +++ b/src/images/SkFlipPixelRef.cpp @@ -74,7 +74,7 @@ SkPixelRef* SkFlipPixelRef::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkFlipPixelRef, (buffer)); }

-static SkPixelRef::Registrar::Registrar reg("SkFlipPixelRef", +static SkPixelRef::Registrar reg("SkFlipPixelRef", SkFlipPixelRef::Create);

/////////////////////////////////////////////////////////////////////////////// diff --git a/src/images/SkImageRef_GlobalPool.cpp b/src/images/SkImageRef_GlobalPool.cpp index 1f0bc43..15d3f0d 100644 --- a/src/images/SkImageRef_GlobalPool.cpp +++ b/src/images/SkImageRef_GlobalPool.cpp @@ -50,7 +50,7 @@ SkPixelRef* SkImageRef_GlobalPool::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkImageRef_GlobalPool, (buffer)); }

-static SkPixelRef::Registrar::Registrar reg("SkImageRef_GlobalPool", +static SkPixelRef::Registrar reg("SkImageRef_GlobalPool", SkImageRef_GlobalPool::Create);

///////////////////////////////////////////////////////////////////////////////