From 45c16fa82cd2fec010d4cb7763b654a413cabd0c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 18 Jul 2017 18:15:13 -0400 Subject: convert over to 2d-mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [√] 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 Reviewed-by: Florin Malita --- tools/picture_utils.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tools/picture_utils.cpp') 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 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(src, bitmap.rowBytes()); - dst += w; - } + p.run(0,0, w,h); return SkData::MakeFromMalloc(rgba.release(), w*h*sizeof(uint32_t)); } -- cgit v1.2.3