diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2018-05-30 15:33:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-01 12:53:25 +0000 |
| commit | 22f673d42087853a151fcd5e95c129be83065cdc (patch) | |
| tree | e4e711677a1e6a02b261acd9346c587ff260d7a0 /src/core/SkBitmap.cpp | |
| parent | 9ea47bedb945fe51c7805b4f2defccccb8249865 (diff) | |
Move SkColorTable to src/codec
It is no longer needed anywhere else, and simply happens to be an
implementation detail of SkCodec (at least for now).
Remove references to SkColorTable in other classes, and clean up some
includes of SkConvertPixels I found along the way.
Remove unused includes/methods on SkColorTable
Change-Id: I46c8e46f5b77c37710b6cf595d48107d55871d52
Reviewed-on: https://skia-review.googlesource.com/130845
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 579573367f..1b6b6b2f5a 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -8,7 +8,6 @@ #include "SkAtomics.h" #include "SkBitmap.h" #include "SkColorData.h" -#include "SkColorTable.h" #include "SkConvertPixels.h" #include "SkData.h" #include "SkFilterQuality.h" @@ -502,7 +501,7 @@ bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY, void* dstPixels = this->getAddr(rec.fX, rec.fY); const SkImageInfo dstInfo = this->info().makeWH(rec.fInfo.width(), rec.fInfo.height()); SkConvertPixels(dstInfo, dstPixels, this->rowBytes(), rec.fInfo, rec.fPixels, rec.fRowBytes, - nullptr, behavior); + behavior); this->notifyPixelsChanged(); return true; } @@ -522,7 +521,7 @@ static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha, int return false; } SkConvertPixels(SkImageInfo::MakeA8(pmap.width(), pmap.height()), alpha, alphaRowBytes, - pmap.info(), pmap.addr(), pmap.rowBytes(), nullptr, + pmap.info(), pmap.addr(), pmap.rowBytes(), SkTransferFunctionBehavior::kRespect); return true; } |