gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix direct use of fl_draw_pixmap() whithout Fl_Pixmap object.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12862 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2018-04-20 08:46:49 +00:00
parent bd9a57be29
commit de762fca2b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/Android/Fl_Android_Graphics_Driver.cxx
View File

@ -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]);