diff options
author | Mike Klein <mtklein@chromium.org> | 2017-07-18 18:15:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 19:50:32 +0000 |
commit | 45c16fa82cd2fec010d4cb7763b654a413cabd0c (patch) | |
tree | 2c6e4376e11dca4b4c3ae479b7835096124016f5 /tools/picture_utils.cpp | |
parent | 3f4671871fac8e5439440ce756d0666bc2a96f46 (diff) |
convert over to 2d-mode
[√] convert all stages to use SkJumper_MemoryCtx / be 2d-compatible
[√] convert compile to 2d also, remove 1d run/compile
[√] convert all call sites
[√] no diffs
Change-Id: I3b806eb8fe0c3ec043359616409f7cd1211a1e43
Reviewed-on: https://skia-review.googlesource.com/24263
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tools/picture_utils.cpp')
-rw-r--r-- | tools/picture_utils.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index 93d598ddbd..f476c0dbc0 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -83,8 +83,8 @@ namespace sk_tools { SkAutoTMalloc<uint32_t> rgba(w*h); - const void* src = bitmap.getPixels(); - uint32_t* dst = rgba.get(); + SkJumper_MemoryCtx src = { bitmap.getPixels(), bitmap.rowBytesAsPixels() }, + dst = { rgba.get(), w }; SkRasterPipeline_<256> p; switch (bitmap.colorType()) { @@ -106,12 +106,7 @@ namespace sk_tools { } p.append(SkRasterPipeline::store_8888, &dst); - auto run = p.compile(); - for (int y = 0; y < h; y++) { - run(0,y, w); - src = SkTAddOffset<const void>(src, bitmap.rowBytes()); - dst += w; - } + p.run(0,0, w,h); return SkData::MakeFromMalloc(rgba.release(), w*h*sizeof(uint32_t)); } |