Author: manolo
Date: 2012-05-18 15:14:05 -0700 (Fri, 18 May 2012)
New Revision: 9533
Log:
Fixed RGBA image drawing under X11 for group-relative coordinates (cont'd).
This writing where all write functions use the same relative coordinates may be
clearer.
Modified:
branches/branch-3.0/src/fltk3/Image.cxx
Modified: branches/branch-3.0/src/fltk3/Image.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Image.cxx 2012-05-18 17:24:22 UTC (rev
9532)
+++ branches/branch-3.0/src/fltk3/Image.cxx 2012-05-18 22:14:05 UTC (rev
9533)
@@ -391,7 +391,7 @@
uchar *dst = new uchar[W * H * 3];
uchar *dstptr = dst;
- fltk3::read_image(dst, X, Y, W, H, 0);
+ fltk3::read_image(dst, X+fltk3::origin_x(), Y+fltk3::origin_y(), W, H, 0);
uchar srcr, srcg, srcb, srca;
uchar dstr, dstg, dstb, dsta;
@@ -432,7 +432,7 @@
}
}
- fltk3::draw_image(dst, X-fltk3::origin_x(), Y-fltk3::origin_y(), W, H, 3, 0);
+ fltk3::draw_image(dst, X, Y, W, H, 3, 0);
delete[] dst;
}
@@ -595,7 +595,7 @@
}
} else {
// Composite image with alpha manually each time...
- alpha_blend(img, X+origin_x(), Y+origin_y(), W, H, cx, cy);
+ alpha_blend(img, X, Y, W, H, cx, cy);
}
}
_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
