mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cairo image drawing improvements

This commit is contained in:
Matthias Melcher 2024-09-01 16:11:31 +02:00
parent 634ce805e5
commit aa6ce6b9f1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
View File

@ -802,8 +802,10 @@ void Fl_Cairo_Graphics_Driver::draw_cached_pattern_(Fl_Image *img, cairo_pattern
cairo_save(cairo_); cairo_save(cairo_);
bool need_extend = (cache_w != Ws || cache_h != Hs || (W >= 2 && H >= 2)); bool need_extend = (cache_w != Ws || cache_h != Hs || (W >= 2 && H >= 2));
if (need_extend || cx || cy || W < img->w() || H < img->h()) { // clip when necessary if (need_extend || cx || cy || W < img->w() || H < img->h()) { // clip when necessary
cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_NONE);
cairo_rectangle(cairo_, X - 0.5, Y - 0.5, W, H); cairo_rectangle(cairo_, X - 0.5, Y - 0.5, W, H);
cairo_clip(cairo_); cairo_clip(cairo_);
cairo_set_antialias(cairo_, CAIRO_ANTIALIAS_DEFAULT);
} }
// remove any scaling and the current "0.5" translation useful for lines but bad for images // remove any scaling and the current "0.5" translation useful for lines but bad for images
matrix.xx = matrix.yy = 1; matrix.xx = matrix.yy = 1;
@ -814,7 +816,7 @@ void Fl_Cairo_Graphics_Driver::draw_cached_pattern_(Fl_Image *img, cairo_pattern
bool condition = Fl_RGB_Image::scaling_algorithm() == FL_RGB_SCALING_BILINEAR && bool condition = Fl_RGB_Image::scaling_algorithm() == FL_RGB_SCALING_BILINEAR &&
(fabs(Ws/float(cache_w) - 1) > 0.02 || fabs(Hs/float(cache_h) - 1) > 0.02); (fabs(Ws/float(cache_w) - 1) > 0.02 || fabs(Hs/float(cache_h) - 1) > 0.02);
cairo_pattern_set_filter(pat, condition ? CAIRO_FILTER_GOOD : CAIRO_FILTER_FAST); cairo_pattern_set_filter(pat, condition ? CAIRO_FILTER_GOOD : CAIRO_FILTER_FAST);
cairo_pattern_set_extend(pat, CAIRO_EXTEND_NONE); cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
} }
cairo_matrix_init_scale(&matrix, double(cache_w)/Ws, double(cache_h)/Hs); cairo_matrix_init_scale(&matrix, double(cache_w)/Ws, double(cache_h)/Hs);
cairo_matrix_translate(&matrix, -Xs , -Ys ); cairo_matrix_translate(&matrix, -Xs , -Ys );