diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:42:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 13:45:47 +0000 |
| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 (patch) | |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba /src/codec | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 (diff) | |
Revert "SkTypes: extract SkTo"
This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.
Reason for revert: this appears to be what is holding up the Chrome roll.
Original change's description:
> SkTypes: extract SkTo
>
> Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> Reviewed-on: https://skia-review.googlesource.com/133620
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,halcanary@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/SkJpegCodec.cpp | 1 | ||||
| -rw-r--r-- | src/codec/SkWbmpCodec.cpp | 4 | ||||
| -rw-r--r-- | src/codec/SkWebpCodec.cpp | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index fd95590bd1..d44258f9b0 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -14,7 +14,6 @@ #include "SkJpegInfo.h" #include "SkStream.h" #include "SkTemplates.h" -#include "SkTo.h" #include "SkTypes.h" // stdio is needed for libjpeg-turbo diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp index 8d4beb12cb..b5fd591729 100644 --- a/src/codec/SkWbmpCodec.cpp +++ b/src/codec/SkWbmpCodec.cpp @@ -5,15 +5,13 @@ * found in the LICENSE file. */ -#include "SkWbmpCodec.h" - #include "SkCodec.h" #include "SkCodecPriv.h" #include "SkColorData.h" #include "SkColorTable.h" #include "SkData.h" #include "SkStream.h" -#include "SkTo.h" +#include "SkWbmpCodec.h" // Each bit represents a pixel, so width is actually a number of bits. // A row will always be stored in bytes, so we round width up to the diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp index e26f46d074..2f9420bd74 100644 --- a/src/codec/SkWebpCodec.cpp +++ b/src/codec/SkWebpCodec.cpp @@ -5,9 +5,6 @@ * found in the LICENSE file. */ -#include "SkWebpCodec.h" - -#include "../jumper/SkJumper.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkCodecAnimation.h" @@ -19,7 +16,8 @@ #include "SkSampler.h" #include "SkStreamPriv.h" #include "SkTemplates.h" -#include "SkTo.h" +#include "SkWebpCodec.h" +#include "../jumper/SkJumper.h" // A WebP decoder on top of (subset of) libwebp // For more information on WebP image format, and libwebp library, see: |