Commit
7d50ba78d283034c6e9b744c8bfe58dbde90d815
Exists in
master
and in
54 other branches
brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, get_pixel, import_mesh, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure_canvas, measure_improvements, measure_placement_test, phoenix, region_growing_confidence, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line
FIX: Fixed error with PIL in win64
| @@ -21,10 +21,10 @@ |
| @@ -21,10 +21,10 @@ |
21
| import sys |
21
| import sys |
22
| import platform |
22
| import platform |
23
| |
23
| |
24
| -if float(platform.python_version()[0:3]) > 2.6: |
| |
25
| - import Image |
| |
26
| -else: |
24
| +try: |
27
| from PIL import Image |
25
| from PIL import Image |
| |
26
| +except(ImportError): |
| |
27
| + import Image |
28
| |
28
| |
29
| import wx |
29
| import wx |
30
| import wx.grid |
30
| import wx.grid |