| commit | 8570b5c8695052378491b0c61e745d736fe85c8d | [log] [tgz] |
|---|---|---|
| author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Mar 20 17:40:58 2012 +0000 |
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Mar 20 17:40:58 2012 +0000 |
| tree | 10d7e94b3b6640379e372fd758540b356aaaf48a | |
| parent | b3e40c04ef3021a3a3a0d64127388707217d7e74 [diff] [blame] |
Adding CMYK jpeg changes w/o .gyp alterations http://codereview.appspot.com/5785054/ git-svn-id: http://skia.googlecode.com/svn/trunk@3442 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp index a7d910f..262cf54 100644 --- a/src/images/SkImageDecoder_wbmp.cpp +++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -151,7 +151,7 @@ #include "SkTRegistry.h" -static SkImageDecoder* Factory(SkStream* stream) { +SkImageDecoder* sk_wbmp_dfactory(SkStream* stream) { wbmp_head head; if (head.init(stream)) { @@ -160,5 +160,5 @@ return NULL; } -static SkTRegistry<SkImageDecoder*, SkStream*> gReg(Factory); +static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_wbmp_dfactory);