Mercurial > octave-nkf
changeset 19272:eb9b2160e878 gui-release
fix build problem with --enable-64 (bug #43319)
* QtHandlesUtils.cc (makeImageFromCData): Ensure arguments to qMin
have the same type.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 09 Oct 2014 15:45:50 -0400 |
| parents | eee862631953 |
| children | b8ffcb88d77c |
| files | libgui/graphics/QtHandlesUtils.cc |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/QtHandlesUtils.cc Thu Oct 09 18:10:19 2014 +0200 +++ b/libgui/graphics/QtHandlesUtils.cc Thu Oct 09 15:45:50 2014 -0400 @@ -220,8 +220,8 @@ if (dv.length () == 3 && dv(2) == 3) { - int w = qMin (dv(1), width); - int h = qMin (dv(0), height); + int w = qMin (dv(1), static_cast<octave_idx_type (width)); + int h = qMin (dv(0), static_cast<octave_idx_type (height)); int x_off = (w < width ? (width - w) / 2 : 0); int y_off = (h < height ? (height - h) / 2 : 0);