diff --git a/bob/fingervein/utils.py b/bob/fingervein/utils.py index 338a274db172b06aa9312ce43d07ed24b8937693..3c75c1add8f7e41e61db57198a17ead30563b7cc 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 ffd0a8414f850e9ca8779d545711e5ec7c76ead9..79211e51eed8fef242ac0a8ec0f183e51c65695e 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 47251654ed4154dc6e479a27cd9ab5e94a1cd55e..e23ff00284e3082400a69090af60744d7f71b4c6 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', ],