From 0d8d74b674de79bbe8cfa5b2babb6eecce754930 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Mon, 23 Nov 2015 15:09:23 +0100
Subject: [PATCH] Updates

---
 bob/db/cuhk_cufsf/create.py | 2 +-
 bob/db/cuhk_cufsf/query.py  | 2 ++
 bob/db/cuhk_cufsf/utils.py  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bob/db/cuhk_cufsf/create.py b/bob/db/cuhk_cufsf/create.py
index 329a052..b8a9617 100644
--- a/bob/db/cuhk_cufsf/create.py
+++ b/bob/db/cuhk_cufsf/create.py
@@ -77,7 +77,7 @@ def add_clients_files_annotations(session, verbose = True):
                      modality="photo"
                 ))
     output[client_id_offset].append(file_id_offset)
-    annotations = open("bob/db/cuhk_cufsf/data/photo_points/{0}tif.pos".format(feret_clients[c][1])).readlines()[0].rstrip("\n").split(" ")
+    annotations = open("bob/db/cuhk_cufsf/data/photo_points/{0}.tif.pos".format(feret_clients[c][1])).readlines()[0].rstrip("\n").split(" ")
     session.add(Annotation(file_id = file_id_offset, re_x=annotations[2], re_y=annotations[3], le_x=annotations[0], le_y=annotations[1] ))
     
 
diff --git a/bob/db/cuhk_cufsf/query.py b/bob/db/cuhk_cufsf/query.py
index b722d8c..7d7e7a2 100644
--- a/bob/db/cuhk_cufsf/query.py
+++ b/bob/db/cuhk_cufsf/query.py
@@ -48,6 +48,8 @@ class Database(bob.db.verification.utils.SQLiteDatabase, bob.db.verification.uti
     bob.db.verification.utils.SQLiteDatabase.__init__(self, SQLITE_FILE, File)
     bob.db.verification.utils.ZTDatabase.__init__(self, original_directory=original_directory, original_extension=original_extension)
 
+    self.feret_directory = feret_directory
+
   
   def protocols(self):
     return PROTOCOLS
diff --git a/bob/db/cuhk_cufsf/utils.py b/bob/db/cuhk_cufsf/utils.py
index 2332a38..509aafd 100644
--- a/bob/db/cuhk_cufsf/utils.py
+++ b/bob/db/cuhk_cufsf/utils.py
@@ -63,7 +63,7 @@ class FERETWrapper():
     for c in raw_clients:
       c_id       = c[0:5]
       sketh_file = c[0:5]
-      photo_file = c[0:-4]
+      photo_file = c[0:-5]
       
       client_files[c[0:5]] = [sketh_file,photo_file]
     
-- 
GitLab