diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-18 14:42:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-18 19:08:16 +0000 |
| commit | b6ab10f34b407d9db9efb69b31849cef010328e3 (patch) | |
| tree | 624d6a43a23a8046aeaa87039ca9f56b547b6839 /src/codec/SkCodec.cpp | |
| parent | 2240be96d97b5ac0886381d74a21f1e2a0928f55 (diff) | |
Move SkCodec::Origin into its own file
It is now used by SkPixmap and will soon be in SkJpegEncoder. No need
for those to depend on SkCodec.
Bug: 768878
TBR=reed@google.com
(reed@ already approved the API change in
https://skia-review.googlesource.com/60721)
Change-Id: If1a6e1d5b60a7a3d8c97818e15a48d28ba804668
Reviewed-on: https://skia-review.googlesource.com/61680
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkCodec.cpp')
| -rw-r--r-- | src/codec/SkCodec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index c3d99f2793..59978c6fdf 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -128,7 +128,7 @@ std::unique_ptr<SkCodec> SkCodec::MakeFromData(sk_sp<SkData> data, SkPngChunkRea SkCodec::SkCodec(int width, int height, const SkEncodedInfo& info, XformFormat srcFormat, std::unique_ptr<SkStream> stream, - sk_sp<SkColorSpace> colorSpace, Origin origin) + sk_sp<SkColorSpace> colorSpace, SkEncodedOrigin origin) : fEncodedInfo(info) , fSrcInfo(info.makeImageInfo(width, height, std::move(colorSpace))) , fSrcXformFormat(srcFormat) @@ -142,7 +142,8 @@ SkCodec::SkCodec(int width, int height, const SkEncodedInfo& info, {} SkCodec::SkCodec(const SkEncodedInfo& info, const SkImageInfo& imageInfo, - XformFormat srcFormat, std::unique_ptr<SkStream> stream, Origin origin) + XformFormat srcFormat, std::unique_ptr<SkStream> stream, + SkEncodedOrigin origin) : fEncodedInfo(info) , fSrcInfo(imageInfo) , fSrcXformFormat(srcFormat) |