Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-23 07:46:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorganize and simplify function Fl_Graphics_Driver::draw(Fl_Shared_Image *, int, int)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12052 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2016-10-21 04:51:15 +00:00
parent 8970b21aa2
commit 52479a5ef1
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Shared_Image.cxx
+16 -22
View File
@@ -373,32 +373,26 @@ void Fl_Shared_Image::draw(int X, int Y, int W, int H, int cx, int cy) {
/** Draws the shared image to the current surface with its top-left at X,Y */
void Fl_Graphics_Driver::draw(Fl_Shared_Image *shared, int X, int Y) {
bool zero_scaled = false;
int done = 0;
if ( shared->w() == shared->image_->w() && shared->h() == shared->image_->h()) {
shared->image_->draw(X, Y, shared->w(), shared->h(), 0, 0);
return;
}
// don't call Fl_Graphics_Driver::draw_scaled(Fl_Image*,...) for an enlarged Fl_Bitmap or Fl_Pixmap
if ((shared->d() != 0 && shared->count() < 2) || (shared->w() <= shared->image_->w() && shared->h() <= shared->image_->h())) {
done = fl_graphics_driver->draw_scaled(shared->image_, X, Y, shared->w(), shared->h());
int done = fl_graphics_driver->draw_scaled(shared->image_, X, Y, shared->w(), shared->h());
if (done) return;
}
if (!done) {
if (shared->scaled_image_ && (shared->scaled_image_->w() != shared->w() || shared->scaled_image_->h() != shared->h())) {
delete shared->scaled_image_;
shared->scaled_image_ = NULL;
}
if (!shared->scaled_image_) {
if ( shared->w() == shared->image_->w() && shared->h() == shared->image_->h()) {
shared->scaled_image_ = shared->image_;
zero_scaled = true;
}
else {
Fl_RGB_Scaling previous = Fl_Shared_Image::RGB_scaling();
Fl_Shared_Image::RGB_scaling(shared->scaling_algorithm_); // useless but no harm if image_ is not an Fl_RGB_Image
shared->scaled_image_ = shared->image_->copy(shared->w(), shared->h());
Fl_Shared_Image::RGB_scaling(previous);
}
}
shared->scaled_image_->draw(X, Y, shared->scaled_image_->w(), shared->scaled_image_->h(), 0, 0);
if (zero_scaled) shared->scaled_image_ = NULL;
if (shared->scaled_image_ && (shared->scaled_image_->w() != shared->w() || shared->scaled_image_->h() != shared->h())) {
delete shared->scaled_image_;
shared->scaled_image_ = NULL;
}
if (!shared->scaled_image_) {
Fl_RGB_Scaling previous = Fl_Shared_Image::RGB_scaling();
Fl_Shared_Image::RGB_scaling(shared->scaling_algorithm_); // useless but no harm if image_ is not an Fl_RGB_Image
shared->scaled_image_ = shared->image_->copy(shared->w(), shared->h());
Fl_Shared_Image::RGB_scaling(previous);
}
shared->scaled_image_->draw(X, Y, shared->scaled_image_->w(), shared->scaled_image_->h(), 0, 0);
}
/** Sets the drawing size of the shared image.