From de762fca2b44e77b6b21bc07d9d24d0b4c30f04d Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 20 Apr 2018 08:46:49 +0000
Subject: Fix direct use of fl_draw_pixmap() whithout Fl_Pixmap object.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12862 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Android/Fl_Android_Graphics_Driver.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/drivers/Android')

diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
index e8e80a6c8..ceed4e5d3 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.cxx
@@ -1118,13 +1118,14 @@ void Fl_Android_Graphics_Driver::draw_fixed(Fl_RGB_Image *img, int X, int Y, int
 void Fl_Android_Graphics_Driver::draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L)
 {
   int srcDelta = abs(D);
-  int srcStride = W*srcDelta+L;
+  int srcStride = L ? L : W*srcDelta;
+  void *see = pBits;
   for (const auto &it: pClippingRegion.overlapping(Fl_Rect_Region(X, Y, W, H))) {
     Fl_Rect_Region *r = &it->clipped_rect();
     int rBottom = r->bottom();
     int rRight = r->right();
     for (int iy=r->top(); iy<rBottom;iy++) {
-      const uchar *src = buf + iy*srcStride;
+      const uchar *src = buf + (iy-Y)*srcStride + (r->left()-X)*srcDelta;
       uint16_t *dst = pBits + iy*pStride + r->left();
       for (int ix=r->left();ix<rRight;ix++) {
         uint16_t c = make565(src[0], src[1], src[2]);
-- 
cgit v1.2.3