diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-15 15:11:56 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-15 15:12:25 +0100 |
| commit | a4866ffc213f27618ffcf9718f1a18007bf779a3 (patch) | |
| tree | e80ea2334d29059f61f5d02bf2c91eb3a2437e2e /src/Fl_Shared_Image.cxx | |
| parent | a620ef5b37d7f32000dfb169c9d8cce6d97ac583 (diff) | |
Partial fix for issue #188.
This fixes the inconsistency created by the possibility to change img->w() and img->h()
values. The fix is to use img->data_w() and img->data_h() that have constant values.
Diffstat (limited to 'src/Fl_Shared_Image.cxx')
| -rw-r--r-- | src/Fl_Shared_Image.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index 832d8a3a0..5e2399f84 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -101,10 +101,10 @@ Fl_Shared_Image::compare(Fl_Shared_Image **i0, // I - First image int i = strcmp((*i0)->name(), (*i1)->name()); if (i) return i; - else if (((*i0)->w() == 0 && (*i1)->original_) || - ((*i1)->w() == 0 && (*i0)->original_)) return 0; - else if ((*i0)->w() != (*i1)->w()) return (*i0)->w() - (*i1)->w(); - else return (*i0)->h() - (*i1)->h(); + else if (((*i0)->data_w() == 0 && (*i1)->original_) || + ((*i1)->data_w() == 0 && (*i0)->original_)) return 0; + else if ((*i0)->data_w() != (*i1)->data_w()) return (*i0)->data_w() - (*i1)->data_w(); + else return (*i0)->data_h() - (*i1)->data_h(); } |