diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 11:21:21 +0200 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 11:21:21 +0200 |
| commit | 1cd3288b5dfce60047265fc499e756ae7b5a2d01 (patch) | |
| tree | 627bab3eccb25ab8e054a6cf9240f3862dc0796e /debian/patches/0005-fix-problem-with-sift-import.patch | |
| parent | f4a3c897c77f7c6bd30e1ce52787f390a23c8ee1 (diff) | |
Removed some patches.
Diffstat (limited to 'debian/patches/0005-fix-problem-with-sift-import.patch')
| -rw-r--r-- | debian/patches/0005-fix-problem-with-sift-import.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/debian/patches/0005-fix-problem-with-sift-import.patch b/debian/patches/0005-fix-problem-with-sift-import.patch deleted file mode 100644 index ac0448a..0000000 --- a/debian/patches/0005-fix-problem-with-sift-import.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - |