From c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:59:02 -0400 Subject: Revert "Revert "SkTypes: extract SkTo"" This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876. > Original change's description: > > SkTypes: extract SkTo > > > > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 > > Reviewed-on: https://skia-review.googlesource.com/133620 > > Reviewed-by: Mike Klein Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- src/codec/SkJpegCodec.cpp | 1 + src/codec/SkWbmpCodec.cpp | 4 +++- src/codec/SkWebpCodec.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/codec') diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index d44258f9b0..fd95590bd1 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -14,6 +14,7 @@ #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 b5fd591729..8d4beb12cb 100644 --- a/src/codec/SkWbmpCodec.cpp +++ b/src/codec/SkWbmpCodec.cpp @@ -5,13 +5,15 @@ * 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 "SkWbmpCodec.h" +#include "SkTo.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 2f9420bd74..e26f46d074 100644 --- a/src/codec/SkWebpCodec.cpp +++ b/src/codec/SkWebpCodec.cpp @@ -5,6 +5,9 @@ * found in the LICENSE file. */ +#include "SkWebpCodec.h" + +#include "../jumper/SkJumper.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkCodecAnimation.h" @@ -16,8 +19,7 @@ #include "SkSampler.h" #include "SkStreamPriv.h" #include "SkTemplates.h" -#include "SkWebpCodec.h" -#include "../jumper/SkJumper.h" +#include "SkTo.h" // A WebP decoder on top of (subset of) libwebp // For more information on WebP image format, and libwebp library, see: -- cgit v1.2.3