Doc and identiation fixes

bob/bio/vein/database/verafinger.py

@@ -64,7 +64,7 @@ class Database(BioDatabase):
 
 
   def client_id_from_model_id(self, model_id, group='dev'):
-      """Required as ``model_id != client_id`` on this database"""
+    """Required as ``model_id != client_id`` on this database"""
 
     return self.__db.finger_name_from_model_id(model_id)
 

bob/bio/vein/preprocessor/FingerCrop.py

@@ -350,9 +350,9 @@ class FingerCrop (Preprocessor):
     img_h, img_w = image.shape
 
     # Calculates the mask edges along the columns
-    edges = numpy.zeros(2, img_w)
+    edges = numpy.zeros((2, img_w), dtype=int)
     edges[0,:] = mask.argmax(axis=0) # get upper edges
-    edges[1,:] = len(mask) - numpy.flipup(mask).argmax(axis=0) - 1
+    edges[1,:] = len(mask) - numpy.flipud(mask).argmax(axis=0) - 1
 
     bl = edges.mean(axis=0) #baseline
     x = numpy.arange(0,img_w)
@@ -442,7 +442,7 @@ class FingerCrop (Preprocessor):
     return retval
 
 
-  def __call__(self, data):
+  def __call__(self, data, annotations):
     """Reads the input image or (image, mask) and prepares for fex.
 
     Parameters:

doc/baselines.rst

@@ -107,10 +107,10 @@ protocol, do the following:
    submit your job for SGE execution, you can run it in parallel (using 4
    parallel tasks) by adding the options ``--parallel=4 --nice=10``.
 
-   Optionally, you may use the ``parallel` resource configuration which already
-   sets the number of parallel jobs to the number of hardware cores you have
-   installed on your machine (as with :py:func:`multiprocessing.cpu_count`) and
-   sets ``nice=10``. For example:
+   Optionally, you may use the ``parallel`` resource configuration which
+   already sets the number of parallel jobs to the number of hardware cores you
+   have installed on your machine (as with
+   :py:func:`multiprocessing.cpu_count`) and sets ``nice=10``. For example:
 
    .. code-block:: sh