[aseprite] 128/250: Fix SkiaSurface::blitTo() with GPU and without GPU acceleration

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit cc8b8cf52e205db9ef6e9aea66905aac4fa20515
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Oct 2 17:14:52 2015 -0300

    Fix SkiaSurface::blitTo() with GPU and without GPU acceleration
---
 src/she/skia/skia_surface.h | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/she/skia/skia_surface.h b/src/she/skia/skia_surface.h
index 9c9e3d9..a665cad 100644
--- a/src/she/skia/skia_surface.h
+++ b/src/she/skia/skia_surface.h
@@ -294,24 +294,10 @@ public:
   }
 
   void blitTo(LockedSurface* dest, int srcx, int srcy, int dstx, int dsty, int width, int height) const override {
-    if (m_surface) {
-      // m_canvas->flush();
-
-      SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-      std::vector<uint32_t> pixels(width * height * 4);
-      m_canvas->readPixels(info, (void*)&pixels[0], 4*width, srcx, srcy);
-      ((SkiaSurface*)dest)->m_canvas->writePixels(info, (void*)&pixels[0], 4*width, dstx, dsty);
-    }
-    else {
-      SkPaint paint;
-      paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-
-      SkRect srcRect = SkRect::Make(SkIRect::MakeXYWH(srcx, srcy, width, height));
-      SkRect dstRect = SkRect::Make(SkIRect::MakeXYWH(dstx, dsty, width, height));
-      ((SkiaSurface*)dest)->m_canvas->drawBitmapRect(
-        m_bitmap, srcRect, dstRect, &paint,
-        SkCanvas::kStrict_SrcRectConstraint);
-    }
+    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+    std::vector<uint32_t> pixels(width * height * 4);
+    m_canvas->readPixels(info, (void*)&pixels[0], 4*width, srcx, srcy);
+    ((SkiaSurface*)dest)->m_canvas->writePixels(info, (void*)&pixels[0], 4*width, dstx, dsty);
   }
 
   void scrollTo(const gfx::Rect& rc, int dx, int dy) override {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git