diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-10-30 09:07:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-03 15:29:34 +0000 |
| commit | 0cbc10f94e2b350761e64b225c97390269f41479 (patch) | |
| tree | a3dd274a32583b289af7fb930ce44a6eec001599 /include/utils | |
| parent | 60aaeb2b551d5e3e90baacac315e899e26f758f1 (diff) | |
Make SkImageGeneratorCG apply encoded origin
SkImageGeneratorCG:
- Detect the origin and apply it to the output
- Deprecate NewFromEncodedCG and add MakeFromEncodedCG
SkCodecImageGenerator:
- Move code elsewhere for sharing
- Apply origin for incomplete decodes
SkPixmap.cpp/SkPixmapPriv.h:
- Now has the shared code for generators to apply origin
DMSrcSink.cpp:
- Call MakeFromEncodedCG
SkCGUtils.h:
- Add a version of SkCopyPixelsFromCGImage that takes an SkPixmap
Bug: skia:7138
Bug: skia:3834
Change-Id: Ic6dbc76360c6a84913b67373582f328d3946d637
Reviewed-on: https://skia-review.googlesource.com/63740
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/mac/SkCGUtils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/utils/mac/SkCGUtils.h b/include/utils/mac/SkCGUtils.h index 2dcbb965b4..06995c3ec1 100644 --- a/include/utils/mac/SkCGUtils.h +++ b/include/utils/mac/SkCGUtils.h @@ -11,6 +11,7 @@ #include "SkSize.h" #include "SkImageInfo.h" #include "SkImage.h" +#include "SkPixmap.h" #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) @@ -46,6 +47,9 @@ SK_API sk_sp<SkImage> SkMakeImageFromCGImage(CGImageRef); */ SK_API bool SkCopyPixelsFromCGImage(const SkImageInfo& info, size_t rowBytes, void* dstPixels, CGImageRef src); +static inline bool SkCopyPixelsFromCGImage(const SkPixmap& dst, CGImageRef src) { + return SkCopyPixelsFromCGImage(dst.info(), dst.rowBytes(), dst.writable_addr(), src); +} /** * Create an imageref from the specified bitmap using the specified colorspace. |