diff options
| author |  agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-05-10 21:20:58 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-05-10 21:20:58 +0000 |
| commit | 39d39c223ad592e19c326140969e954563d2e37e (patch) | |
| tree | 4191c313adea3f9c824052ca8928cb0f489c06fb | |
| parent | 70a303f3c949707ce36ed2847701571cd047f14e (diff) | |
Minor fixes to build under Clang:
- Remove an unused ctor that was wrong anyway.
- Add magic angle brackets to a template declaration.
Patch-by: Evan Martin
git-svn-id: http://skia.googlecode.com/svn/trunk@563 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkFloat.h | 2 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_Factory.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkFloat.h b/src/core/SkFloat.h index 31aaeedee2..9435dd0eab 100644 --- a/src/core/SkFloat.h +++ b/src/core/SkFloat.h @@ -96,8 +96,6 @@ public: private: int32_t fPacked; - SkFloat(int32_t packed) : fPacked(fPacked) {} - public: static int GetShift(int32_t packed, int shift); static int32_t SetShift(int value, int shift); diff --git a/src/images/SkImageDecoder_Factory.cpp b/src/images/SkImageDecoder_Factory.cpp index e7c71e52c9..2090d857dc 100644 --- a/src/images/SkImageDecoder_Factory.cpp +++ b/src/images/SkImageDecoder_Factory.cpp @@ -22,7 +22,7 @@ typedef SkTRegistry<SkImageDecoder*, SkStream*> DecodeReg; -template DecodeReg* DecodeReg::gHead; +template<> DecodeReg* DecodeReg::gHead; #ifdef SK_ENABLE_LIBPNG extern SkImageDecoder* sk_libpng_dfactory(SkStream*); |