diff options
author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
---|---|---|
committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
commit | c49572a2e90b398e90a43f86b490f27ee6c58de6 (patch) | |
tree | d130cf7dfc3cf73157e1bece8173331bb4bc7156 /silx/gui/_glutils | |
parent | 0bbc8ab933e62c1fa6d548e879ae6d98cbd461f1 (diff) | |
parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) |
Merge tag 'upstream/0.9.0+dfsg'
Upstream version 0.9.0+dfsg
Diffstat (limited to 'silx/gui/_glutils')
-rw-r--r-- | silx/gui/_glutils/font.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/silx/gui/_glutils/font.py b/silx/gui/_glutils/font.py index b5bd6b5..8403c5a 100644 --- a/silx/gui/_glutils/font.py +++ b/silx/gui/_glutils/font.py @@ -32,7 +32,7 @@ __date__ = "13/10/2016" import logging import numpy -from ..utils._image import convertQImageToArray +from ..utils.image import convertQImageToArray from .. import qt _logger = logging.getLogger(__name__) |