diff options
| author | 2023-02-14 14:29:25 +0000 | |
|---|---|---|
| committer | 2023-02-14 14:30:29 +0000 | |
| commit | 08409e237bc61f1235ba5847ffdf6413f773836d (patch) | |
| tree | fa77c9a93f75a9833d0e3d4ff7037e7db129fc71 | |
| parent | ab3b2e356524407c6674a16cd109fcdd759c9fdb (diff) | |
Fix Skia includes around codecs
In https://skia-review.googlesource.com/c/skia/+/642658 we are
cleaning up Skia includes. These changes are necessary to address
issues from that CL or are pre-emptive for future include refactoring.
Change-Id: I8af0c7979d62f779df74065d5dd548bbc2ce31b5
| -rw-r--r-- | libs/hwui/hwui/ImageDecoder.cpp | 12 | ||||
| -rw-r--r-- | libs/hwui/jni/ImageDecoder.cpp | 5 | ||||
| -rw-r--r-- | native/graphics/jni/imagedecoder.cpp | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/libs/hwui/hwui/ImageDecoder.cpp b/libs/hwui/hwui/ImageDecoder.cpp index 5bf53d0c1790..8266beb4ee8c 100644 --- a/libs/hwui/hwui/ImageDecoder.cpp +++ b/libs/hwui/hwui/ImageDecoder.cpp @@ -17,13 +17,25 @@ #include "ImageDecoder.h" #include <Gainmap.h> +#include <SkAlphaType.h> #include <SkAndroidCodec.h> #include <SkBitmap.h> #include <SkBlendMode.h> #include <SkCanvas.h> +#include <SkCodec.h> +#include <SkCodecAnimation.h> +#include <SkColorSpace.h> +#include <SkColorType.h> #include <SkEncodedOrigin.h> +#include <SkImageInfo.h> #include <SkGainmapInfo.h> +#include <SkMatrix.h> #include <SkPaint.h> +#include <SkPngChunkReader.h> +#include <SkRect.h> +#include <SkRefCnt.h> +#include <SkSamplingOptions.h> +#include <SkSize.h> #include <SkStream.h> #include <hwui/Bitmap.h> #include <log/log.h> diff --git a/libs/hwui/jni/ImageDecoder.cpp b/libs/hwui/jni/ImageDecoder.cpp index add62b1f0d6d..fda7080f2864 100644 --- a/libs/hwui/jni/ImageDecoder.cpp +++ b/libs/hwui/jni/ImageDecoder.cpp @@ -18,11 +18,16 @@ #include <FrontBufferedStream.h> #include <HardwareBitmapUploader.h> +#include <SkAlphaType.h> #include <SkAndroidCodec.h> #include <SkBitmap.h> +#include <SkCodec.h> +#include <SkCodecAnimation.h> #include <SkColorSpace.h> +#include <SkColorType.h> #include <SkImageInfo.h> #include <SkRect.h> +#include <SkSize.h> #include <SkStream.h> #include <SkString.h> #include <androidfw/Asset.h> diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp index cd6ed2391608..e18b4a9d2420 100644 --- a/native/graphics/jni/imagedecoder.cpp +++ b/native/graphics/jni/imagedecoder.cpp @@ -25,10 +25,14 @@ #include <hwui/ImageDecoder.h> #include <log/log.h> #include <SkAndroidCodec.h> +#include <SkAlphaType.h> #include <SkCodec.h> +#include <SkCodecAnimation.h> #include <SkColorSpace.h> +#include <SkColorType.h> #include <SkImageInfo.h> #include <SkRect.h> +#include <SkRefCnt.h> #include <SkSize.h> #include <SkStream.h> #include <utils/Color.h> |