From 9168f9a29be1cfe6f06cfcd64e3bb7327512e5b5 Mon Sep 17 00:00:00 2001
From: Pedro TOME <pedro.tome@idiap.ch>
Date: Mon, 9 Mar 2015 14:57:51 +0100
Subject: [PATCH] updated to travis
---
bob/fingervein/utils.py | 1 +
buildout.cfg | 4 ++--
setup.py | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bob/fingervein/utils.py b/bob/fingervein/utils.py
index 338a274..3c75c1a 100644
--- a/bob/fingervein/utils.py
+++ b/bob/fingervein/utils.py
@@ -28,6 +28,7 @@ def imfilter(a, b, gpu=False, conv=True):
return xbob.cusp.conv(a_ext, b)
else:
return scipy.signal.convolve2d(a_ext, b, 'valid')
+ #return = self.convfft(a_ext, b)
diff --git a/buildout.cfg b/buildout.cfg
index ffd0a84..79211e5 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -31,13 +31,13 @@ newest = false
facereclib = git https://github.com/idiap/facereclib.git
bob.db.vera = git https://github.com/bioidiap/bob.db.vera.git
bob.db.utfvp = git https://github.com/bioidiap/bob.db.utfvp.git
+bob.io.matlab = git https://github.com/bioidiap/bob.io.matlab.git
bob.blitz = git https://github.com/bioidiap/bob.blitz.git
bob.core = git https://github.com/bioidiap/bob.core.git
bob.io.base = git https://github.com/bioidiap/bob.io.base.git
-bob.io.image = git https://github.com/bioidiap/bob.io.image.git
bob.ip.base = git https://github.com/bioidiap/bob.ip.base.git
bob.sp = git https://github.com/bioidiap/bob.sp.git
-bob.io.matlab = git https://github.com/bioidiap/bob.io.matlab.git
+
[scripts]
recipe = bob.buildout:scripts
diff --git a/setup.py b/setup.py
index 4725165..e23ff00 100644
--- a/setup.py
+++ b/setup.py
@@ -69,11 +69,10 @@ setup(
install_requires=[
'setuptools',
'bob.io.base',
- 'bob.io.image',
+ 'bob.io.matlab',
'bob.core',
'bob.ip.base',
- 'bob.sp',
- 'bob.io.matlab',
+ 'bob.sp',
'facereclib',
],
--
GitLab