diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 21:01:41 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 21:01:41 +0000 |
| commit | 52e935d04c59135739c3a68fb6e19d313dc6d5ad (patch) | |
| tree | 95f7ab178b045bef4456cbf92c6aa7e476becd99 /skia/ports/SkImageDecoder_Factory.cpp | |
| parent | 30fab79877b4bb067944b74d98346ac9bb6bfc7e (diff) | |
| download | chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.zip chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.tar.gz chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.tar.bz2 | |
New drop of Skia. This is up to CL 121320.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ports/SkImageDecoder_Factory.cpp')
| -rw-r--r-- | skia/ports/SkImageDecoder_Factory.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/skia/ports/SkImageDecoder_Factory.cpp b/skia/ports/SkImageDecoder_Factory.cpp index 67d4dcb..d5d7b3f 100644 --- a/skia/ports/SkImageDecoder_Factory.cpp +++ b/skia/ports/SkImageDecoder_Factory.cpp @@ -1,6 +1,6 @@ /* libs/graphics/ports/SkImageDecoder_Factory.cpp ** -** Copyright 2006, Google Inc. +** Copyright 2006, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -19,19 +19,12 @@ #include "SkMovie.h" #include "SkStream.h" -//#define USE_PV_FOR_JPEG - extern SkImageDecoder* SkImageDecoder_GIF_Factory(SkStream*); extern SkImageDecoder* SkImageDecoder_BMP_Factory(SkStream*); extern SkImageDecoder* SkImageDecoder_ICO_Factory(SkStream*); extern SkImageDecoder* SkImageDecoder_PNG_Factory(SkStream*); extern SkImageDecoder* SkImageDecoder_WBMP_Factory(SkStream*); -#ifdef USE_PV_FOR_JPEG - extern SkImageDecoder* SkImageDecoder_PVJPEG_Factory(SkStream*); -#else - extern SkImageDecoder* SkImageDecoder_JPEG_Factory(SkStream*); -#endif - +extern SkImageDecoder* SkImageDecoder_JPEG_Factory(SkStream*); typedef SkImageDecoder* (*SkImageDecoderFactoryProc)(SkStream*); @@ -46,12 +39,7 @@ static const CodecFormat gPairs[] = { { SkImageDecoder_ICO_Factory, SkImageDecoder::kICO_Format }, { SkImageDecoder_WBMP_Factory, SkImageDecoder::kWBMP_Format }, { SkImageDecoder_BMP_Factory, SkImageDecoder::kBMP_Format }, - // jpeg must be last, as it doesn't have a good sniffer yet -#ifdef USE_PV_FOR_JPEG - { SkImageDecoder_PVJPEG_Factory, SkImageDecoder::kJPEG_Format } -#else { SkImageDecoder_JPEG_Factory, SkImageDecoder::kJPEG_Format } -#endif }; SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) { |