From 6e759327cfd1b9690c3b503c2343832877ada1b5 Mon Sep 17 00:00:00 2001 From: ccremers Date: Mon, 7 Aug 2006 11:33:25 +0000 Subject: [PATCH] - Bugfixes for non-pil stuff. --- gui/Attackwindow.py | 2 +- gui/Scytherthread.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/Attackwindow.py b/gui/Attackwindow.py index 9e2a8fe..1f84c8b 100644 --- a/gui/Attackwindow.py +++ b/gui/Attackwindow.py @@ -83,7 +83,7 @@ class AttackDisplay(wx.ScrolledWindow): (W,H) = (bmp.GetWidth(), bmp.GetHeight()) if self.win.fit: (H,W) = makefit(H,W) - bmp = self.original.Scale(W,H) + bmp = self.original.Scale(H,W) self.Image.SetBitmap(wx.BitmapFromImage(bmp)) elif self.attack.filetype == "ps": pil = self.original.copy() diff --git a/gui/Scytherthread.py b/gui/Scytherthread.py index 90f0b6b..a4bd9e0 100644 --- a/gui/Scytherthread.py +++ b/gui/Scytherthread.py @@ -131,7 +131,7 @@ class AttackThread(threading.Thread): cmd = "dot -T%s" % (type) # execute command - cin,cout = os.popen2(cmd) + cin,cout = os.popen2(cmd,'b') cin.write(attack.scytherDot) cin.close()