Mercurial > octave
changeset 27107:6bc32e6a1b4f
Restore hability to compile with Qt < 5.6 (bug #56376)
* contributors.in: Add Antonius Burgers who provided the fix for compiling
again using Qt < 5.6.
* Figure.cc (pointer_to_qimage): Use setPixel rather than setPixelColor which
is not available in Qt < 5.6.
(Figure::update): Properly use OCTAVE_FALLTHROUGH to indicate the fallthrough
is expected.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Thu, 23 May 2019 21:21:59 +0200 |
| parents | 6bfd3a890185 |
| children | 2e5d8cdc7087 |
| files | doc/interpreter/contributors.in libgui/graphics/Figure.cc |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/contributors.in Thu May 23 13:56:23 2019 -0700 +++ b/doc/interpreter/contributors.in Thu May 23 21:21:59 2019 +0200 @@ -43,6 +43,7 @@ Remy Bruno Clemens Buchacher Ansgar Burchard +Antonius Burgers Marco Caliari Daniel Calvelo John C. Campbell
--- a/libgui/graphics/Figure.cc Thu May 23 13:56:23 2019 -0700 +++ b/libgui/graphics/Figure.cc Thu May 23 21:21:59 2019 +0200 @@ -98,7 +98,7 @@ else tmp.setAlpha (0); - retval.setPixelColor(jj, ii, tmp); + retval.setPixel (jj, ii, tmp.rgba ()); } return retval; @@ -457,8 +457,7 @@ pointer_to_qimage (fp.get_pointershapecdata ().matrix_value ()); if (fp.get_pointer () != "custom") break; - // Avoid warning about potential fallthrough - [[fallthrough]]; + OCTAVE_FALLTHROUGH; case figure::properties::ID_POINTER: case figure::properties::ID_POINTERSHAPEHOTSPOT: