diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:24:08 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:24:08 +0000 |
| commit | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (patch) | |
| tree | c6b87adb0a09e54eee77ba3363956738a1b7967f /src/images | |
| parent | 94bdd7e3fcf493f827263bd922cb09fb4b50df4c (diff) | |
add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning
BUG=
R=robertphillips@google.com, senorblanco@chromium.org, vandebo@chromium.org
Review URL: https://codereview.chromium.org/51033004
git-svn-id: http://skia.googlecode.com/svn/trunk@12055 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder.cpp | 4 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libwebp.cpp | 2 | ||||
| -rw-r--r-- | src/images/SkImageEncoder_argb.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp index 89bd0597c8..74c80bc73f 100644 --- a/src/images/SkImageDecoder.cpp +++ b/src/images/SkImageDecoder.cpp @@ -229,7 +229,7 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize, int srcX, int srcY) { int w = width / sampleSize; int h = height / sampleSize; - if (src->getConfig() == SkBitmap::kIndex8_Config) { + if (src->config() == SkBitmap::kIndex8_Config) { // kIndex8 does not allow drawing via an SkCanvas, as is done below. // Instead, use extractSubset. Note that this shares the SkPixelRef and // SkColorTable. @@ -245,7 +245,7 @@ bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize, } // if the destination has no pixels then we must allocate them. if (dst->isNull()) { - dst->setConfig(src->getConfig(), w, h, 0, src->alphaType()); + dst->setConfig(src->config(), w, h, 0, src->alphaType()); if (!this->allocPixelRef(dst, NULL)) { SkDEBUGF(("failed to allocate pixels needed to crop the bitmap")); diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp index 68014dd392..ab58aef135 100644 --- a/src/images/SkImageDecoder_libwebp.cpp +++ b/src/images/SkImageDecoder_libwebp.cpp @@ -521,7 +521,7 @@ private: bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm, int quality) { - const SkBitmap::Config config = bm.getConfig(); + const SkBitmap::Config config = bm.config(); const ScanlineImporter scanline_import = ChooseImporter(config); if (NULL == scanline_import) { return false; diff --git a/src/images/SkImageEncoder_argb.cpp b/src/images/SkImageEncoder_argb.cpp index 5abc23ce6f..97b741b8bf 100644 --- a/src/images/SkImageEncoder_argb.cpp +++ b/src/images/SkImageEncoder_argb.cpp @@ -87,7 +87,7 @@ static ScanlineImporter ChooseImporter(const SkBitmap::Config& config) { } bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) { - const SkBitmap::Config config = bitmap.getConfig(); + const SkBitmap::Config config = bitmap.config(); const ScanlineImporter scanline_import = ChooseImporter(config); if (NULL == scanline_import) { return false; |