diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 01:06:14 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 01:06:14 +0000 |
| commit | dc6ed80e71fb605ca03ce3a2a61d93845366f9d9 (patch) | |
| tree | 2a3af1586225efa40595d4a3de72424806f7fe25 /skia/ports | |
| parent | f0bf6056b112fc85acdcc4ca47912c84536efeb2 (diff) | |
| download | chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.zip chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.tar.gz chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.tar.bz2 | |
Make Skia build as a dynamic library by fixing up the imports.
The define in the SCons file / vsprops was unused in the Skia source; I imagine
usage of it was removed in the recent Skia merge.
Review URL: http://codereview.chromium.org/16263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ports')
| -rw-r--r-- | skia/ports/SkImageDecoder_Factory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/skia/ports/SkImageDecoder_Factory.cpp b/skia/ports/SkImageDecoder_Factory.cpp index d5d7b3f..585957c 100644 --- a/skia/ports/SkImageDecoder_Factory.cpp +++ b/skia/ports/SkImageDecoder_Factory.cpp @@ -34,12 +34,14 @@ struct CodecFormat { }; static const CodecFormat gPairs[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE { SkImageDecoder_GIF_Factory, SkImageDecoder::kGIF_Format }, { SkImageDecoder_PNG_Factory, SkImageDecoder::kPNG_Format }, { SkImageDecoder_ICO_Factory, SkImageDecoder::kICO_Format }, { SkImageDecoder_WBMP_Factory, SkImageDecoder::kWBMP_Format }, { SkImageDecoder_BMP_Factory, SkImageDecoder::kBMP_Format }, { SkImageDecoder_JPEG_Factory, SkImageDecoder::kJPEG_Format } +#endif }; SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) { @@ -73,11 +75,15 @@ extern SkMovie* SkMovie_GIF_StreamFactory(SkStream*); extern SkMovie* SkMovie_GIF_MemoryFactory(const void*, size_t); static const SkMovieStreamProc gStreamProc[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE SkMovie_GIF_StreamFactory +#endif }; static const SkMovieMemoryProc gMemoryProc[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE SkMovie_GIF_MemoryFactory +#endif }; SkMovie* SkMovie::DecodeStream(SkStream* stream) { |