diff options
author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 11:17:37 +0200 |
---|---|---|
committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 11:17:37 +0200 |
commit | e28332a035900fc209d973da5116cd14eea46440 (patch) | |
tree | 2b9a408f9a7fbe944508d71c5047e7fb76ce03f0 /debian/patches | |
parent | 2cce8c17331e6bb85832e133364a230ebc02e2b3 (diff) |
fix the sift import problem
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/0005-fix-problem-with-sift-import.patch | 25 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/0005-fix-problem-with-sift-import.patch b/debian/patches/0005-fix-problem-with-sift-import.patch new file mode 100644 index 0000000..ac0448a --- /dev/null +++ b/debian/patches/0005-fix-problem-with-sift-import.patch @@ -0,0 +1,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 + diff --git a/debian/patches/series b/debian/patches/series index 11126a1..6669377 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0003-fix-unit-test.patch 0003-do-not-modify-PYTHONPATH-from-setup.py.patch 0004-fix-missing-import.patch +0005-fix-problem-with-sift-import.patch |