wxGUI/animation: fix https://trac.osgeo.org/grass/ticket/3894 and htt…

…ps://trac.osgeo.org/grass/ticket/3895
OSGeo · Sep 1, 2019 · c6ad0c2 · c6ad0c2
1 parent ecf099f
commit c6ad0c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/gui/wxpython/animation/dialogs.py b/gui/wxpython/animation/dialogs.py
@@ -43,7 +43,7 @@
 from gui_core.gselect import Select
 from gui_core.widgets import FloatValidator
 from gui_core.wrap import SpinCtrl, CheckBox, TextCtrl, Button, \
-    BitmapButton, StaticText, StaticBox, Choice, RadioButton
+    BitmapButton, StaticText, StaticBox, Choice, RadioButton, EmptyImage
 
 from animation.utils import TemporalMode, getRegisteredMaps, getNameAndLayer, getCpuCount
 from animation.data import AnimationData, AnimLayer
@@ -1085,7 +1085,7 @@ def _createDecorationsProperties(self, panel):
 
         # image
         self.imageBox = wx.BoxSizer(wx.HORIZONTAL)
-        filetype, ltype = GetImageHandlers(wx.EmptyImage(10, 10))
+        filetype, ltype = GetImageHandlers(EmptyImage(10, 10))
         self.browse = filebrowse.FileBrowseButton(
             parent=panel, id=wx.ID_ANY, fileMask=filetype,
             labelText=_("Image file:"),

diff --git a/gui/wxpython/animation/provider.py b/gui/wxpython/animation/provider.py
@@ -32,7 +32,7 @@
 from core.utils import autoCropImageFromFile
 
 from animation.utils import HashCmd, HashCmds, GetFileFromCmd, GetFileFromCmds
-from gui_core.wrap import EmptyBitmap
+from gui_core.wrap import EmptyBitmap, BitmapFromImage
 
 import grass.script.core as gcore
 from grass.script.task import cmdlist_to_tuple
@@ -308,7 +308,7 @@ def LoadOverlay(self, cmd):
             cmdTuple[0], **cmdTuple[1])
 
         if returncode == 0:
-            return wx.BitmapFromImage(autoCropImageFromFile(filename))
+            return BitmapFromImage(autoCropImageFromFile(filename))
         else:
             os.remove(filename)
             raise GException(messages)
@@ -519,7 +519,7 @@ def Compose(self, cmdLists, regions, opacityList, bgcolor, force, nprocs):
                         self._bitmapPool[
                             HashCmds(
                                 cmd_lists[i][0],
-                                cmd_lists[i][1])] = wx.BitmapFromImage(
+                                cmd_lists[i][1])] = BitmapFromImage(
                             wx.Image(filename))
                         os.remove(filename)
                 proc_count = 0

diff --git a/gui/wxpython/animation/utils.py b/gui/wxpython/animation/utils.py
@@ -265,13 +265,8 @@ def RenderText(text, font, bgcolor, fgcolor):
 def WxImageToPil(image):
     """Converts wx.Image to PIL image"""
     pilImage = Image.new('RGB', (image.GetWidth(), image.GetHeight()))
-    getattr(
-        pilImage,
-        "frombytes",
-        getattr(
-            pilImage,
-            "fromstring"))(
-        image.GetData())
+    getattr(pilImage, "frombytes", getattr(pilImage, "fromstring"))(
+        bytes(image.GetData()))
     return pilImage