blob: ac0448a1df949ce011828d0f5f74f81d07d3698f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca@synchrotron-soleil.fr>
Date: Tue, 28 May 2019 11:16:24 +0200
Subject: fix problem with sift import
---
silx/gui/plot/CompareImages.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/silx/gui/plot/CompareImages.py b/silx/gui/plot/CompareImages.py
index f7c4899..8a26234 100644
--- a/silx/gui/plot/CompareImages.py
+++ b/silx/gui/plot/CompareImages.py
@@ -48,7 +48,10 @@ _logger = logging.getLogger(__name__)
from silx.opencl import ocl
if ocl is not None:
- from silx.opencl import sift
+ try:
+ from silx.opencl import sift
+ except ImportError:
+ sift = None
else: # No OpenCL device or no pyopencl
sift = None
|
