jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #548 from KurtJacobson/fix_ImageTk_import

Browse source 
bug: fix import of ImageTk so that it works with python-pil
This commit is contained in:
jethornton 2019-01-08 09:57:57 -06:00 committed by GitHub
commit 77309ebf92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/emc/usr_intf/axis/scripts/image-to-gcode.py
View file

@ -25,7 +25,7 @@ gettext.install("linuxcnc", localedir=os.path.join(BASE, "share", "locale"), uni
try: try:
from PIL import Image from PIL import Image
except: except ImportError:
import Image import Image
import numpy.core import numpy.core
@ -495,7 +495,12 @@ class ArcEntryCut:
def ui(im, nim, im_name): def ui(im, nim, im_name):
import Tkinter import Tkinter
try:
from PIL import ImageTk
except ImportError:
import ImageTk import ImageTk
import pickle import pickle
import nf import nf