diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 16:16:37 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 16:16:37 +0000 |
commit | 1d91600a0272025364e2d3447b4c085f470a773b (patch) | |
tree | 9378d08705adb108aa60eaa35979c5d310d35d11 /gm/image.cpp | |
parent | ac03d91ee03599eab946a8ad25e33f9fc5f3166e (diff) |
Add SkImage->draw() call with src and dst rects.
R=junov@chromium.org, senorblanco@chromium.org, reed@google.com
Author: arbesfeld@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19729007
git-svn-id: http://skia.googlecode.com/svn/trunk@10237 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/image.cpp')
-rw-r--r-- | gm/image.cpp | 75 |
1 files changed, 56 insertions, 19 deletions
diff --git a/gm/image.cpp b/gm/image.cpp index 71fe0e176f..7ac2fe9e8f 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -36,11 +36,18 @@ static void drawJpeg(SkCanvas* canvas, const SkISize& size) { // rebaseline. SkAutoDataUnref data(fileToData("/Users/mike/Downloads/skia.google.jpeg")); SkImage* image = SkImage::NewEncodedData(data); + if (image) { + SkRect* src = NULL; + SkRect dst; + src->set(0, 0, image->width(), image->height()); + dst.set(0, 0, size.width(), size.height()); + SkAutoCanvasRestore acr(canvas, true); canvas->scale(size.width() * 1.0f / image->width(), size.height() * 1.0f / image->height()); - image->draw(canvas,0, 0, NULL); + image->draw(canvas, 0, 0, NULL); + image->draw(canvas, src, dst, NULL); image->unref(); } } @@ -65,7 +72,7 @@ static void drawContents(SkSurface* surface, SkColor fillC) { canvas->drawCircle(size.fWidth/2, size.fHeight/2, radius, paint); } -static void test_surface(SkCanvas* canvas, SkSurface* surf) { +static void test_surface(SkCanvas* canvas, SkSurface* surf, bool usePaint) { drawContents(surf, SK_ColorRED); SkImage* imgR = surf->newImageSnapshot(); @@ -87,9 +94,26 @@ static void test_surface(SkCanvas* canvas, SkSurface* surf) { // paint.setFilterBitmap(true); // paint.setAlpha(0x80); - imgR->draw(canvas, 0, 0, &paint); - imgG->draw(canvas, 0, 80, &paint); - surf->draw(canvas, 0, 160, &paint); + imgR->draw(canvas, 0, 0, usePaint ? &paint : NULL); + imgG->draw(canvas, 0, 80, usePaint ? &paint : NULL); + surf->draw(canvas, 0, 160, usePaint ? &paint : NULL); + + SkRect src1, src2, src3; + src1.set(0, 0, surf->width(), surf->height()); + src2.set(-surf->width() / 2, -surf->height() / 2, + surf->width(), surf->height()); + src3.set(0, 0, surf->width() / 2, surf->height() / 2); + + SkRect dst1, dst2, dst3, dst4; + dst1.set(0, 240, 65, 305); + dst2.set(0, 320, 65, 385); + dst3.set(0, 400, 65, 465); + dst4.set(0, 480, 65, 545); + + imgR->draw(canvas, &src1, dst1, usePaint ? &paint : NULL); + imgG->draw(canvas, &src2, dst2, usePaint ? &paint : NULL); + imgR->draw(canvas, &src3, dst3, usePaint ? &paint : NULL); + imgG->draw(canvas, NULL, dst4, usePaint ? &paint : NULL); imgG->unref(); imgR->unref(); @@ -122,7 +146,7 @@ protected: } virtual SkISize onISize() { - return SkISize::Make(800, 500); + return SkISize::Make(960, 1200); } virtual void onDraw(SkCanvas* canvas) { @@ -133,22 +157,32 @@ protected: static const char* kLabel1 = "Original Img"; static const char* kLabel2 = "Modified Img"; static const char* kLabel3 = "Cur Surface"; + static const char* kLabel4 = "Full Crop"; + static const char* kLabel5 = "Over-crop"; + static const char* kLabel6 = "Upper-left"; + static const char* kLabel7 = "No Crop"; - static const char* kLabel4 = "Pre-Alloc Img"; - static const char* kLabel5 = "New Alloc Img"; - static const char* kLabel6 = "SkPicture"; - static const char* kLabel7 = "GPU"; + static const char* kLabel8 = "Pre-Alloc Img"; + static const char* kLabel9 = "New Alloc Img"; + static const char* kLabel10 = "SkPicture"; + static const char* kLabel11 = "Null Paint"; + static const char* kLabel12 = "GPU"; SkPaint textPaint; canvas->drawText(kLabel1, strlen(kLabel1), 10, 60, textPaint); canvas->drawText(kLabel2, strlen(kLabel2), 10, 140, textPaint); canvas->drawText(kLabel3, strlen(kLabel3), 10, 220, textPaint); + canvas->drawText(kLabel4, strlen(kLabel4), 10, 300, textPaint); + canvas->drawText(kLabel5, strlen(kLabel5), 10, 380, textPaint); + canvas->drawText(kLabel6, strlen(kLabel6), 10, 460, textPaint); + canvas->drawText(kLabel7, strlen(kLabel7), 10, 540, textPaint); - canvas->drawText(kLabel4, strlen(kLabel4), 80, 10, textPaint); - canvas->drawText(kLabel5, strlen(kLabel5), 160, 10, textPaint); - canvas->drawText(kLabel6, strlen(kLabel6), 250, 10, textPaint); - canvas->drawText(kLabel7, strlen(kLabel7), 340, 10, textPaint); + canvas->drawText(kLabel8, strlen(kLabel8), 80, 10, textPaint); + canvas->drawText(kLabel9, strlen(kLabel9), 160, 10, textPaint); + canvas->drawText(kLabel10, strlen(kLabel10), 250, 10, textPaint); + canvas->drawText(kLabel11, strlen(kLabel11), 320, 10, textPaint); + canvas->drawText(kLabel12, strlen(kLabel12), 410, 10, textPaint); canvas->translate(80, 20); @@ -164,21 +198,24 @@ protected: SkAutoTUnref<SkSurface> surf0(SkSurface::NewRasterDirect(info, fBuffer, RB)); SkAutoTUnref<SkSurface> surf1(SkSurface::NewRaster(info)); SkAutoTUnref<SkSurface> surf2(SkSurface::NewPicture(info.fWidth, info.fHeight)); + SkAutoTUnref<SkSurface> surf3(SkSurface::NewPicture(info.fWidth, info.fHeight)); #if SK_SUPPORT_GPU GrContext* ctx = skiagm::GetGr(); - SkAutoTUnref<SkSurface> surf3(SkSurface::NewRenderTarget(ctx, info, 0)); + SkAutoTUnref<SkSurface> surf4(SkSurface::NewRenderTarget(ctx, info, 0)); #endif - test_surface(canvas, surf0); + test_surface(canvas, surf0, true); + canvas->translate(80, 0); + test_surface(canvas, surf1, true); canvas->translate(80, 0); - test_surface(canvas, surf1); + test_surface(canvas, surf2, true); canvas->translate(80, 0); - test_surface(canvas, surf2); + test_surface(canvas, surf3, false); #if SK_SUPPORT_GPU if (NULL != ctx) { canvas->translate(80, 0); - test_surface(canvas, surf3); + test_surface(canvas, surf4, true); } #endif } |