aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-12-02 13:17:05 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-12-02 13:17:06 -0800
commit701dd4fbd7942f98e413807491f62898941c142c (patch)
tree2ce050586bde6eaf619140fd9d26f02bf744ce15
parent252fccfb546efe83fb1d2c7a0b3c18a96ff46ea4 (diff)
Flail a little against LLVM crash.
Cannot reproduce this in my local Chromium checkout (using their Clang, just like the bots). BUG=skia: TBR=reed@google.com Review URL: https://codereview.chromium.org/764433003
-rw-r--r--include/core/SkColorTable.h2
-rw-r--r--src/core/SkColorTable.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/core/SkColorTable.h b/include/core/SkColorTable.h
index c8cc3d0fb4..d6b3c210f5 100644
--- a/include/core/SkColorTable.h
+++ b/include/core/SkColorTable.h
@@ -53,7 +53,7 @@ public:
void writeToBuffer(SkWriteBuffer&) const;
private:
- static void Free16BitCache(uint16_t* cache) { sk_free(cache); }
+ static void Free16BitCache(uint16_t*);
SkPMColor* fColors;
SkLazyPtr<uint16_t, Free16BitCache> f16BitCache;
diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp
index 84469c2b06..5a4e0a44e2 100644
--- a/src/core/SkColorTable.cpp
+++ b/src/core/SkColorTable.cpp
@@ -54,6 +54,8 @@ struct Build16BitCache {
};
}//namespace
+void SkColorTable::Free16BitCache(uint16_t* cache) { sk_free(cache); }
+
const uint16_t* SkColorTable::read16BitCache() const {
const Build16BitCache create = { fColors, fCount };
return f16BitCache.get(create);