potential fixes for matlab bridge?

menpo · Aug 2, 2015 · 7ac74af · 7ac74af
1 parent dbc5dcf
commit 7ac74af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/menpobench/method/io.py b/menpobench/method/io.py
@@ -18,9 +18,9 @@ def images_to_mat(images, out_path, attach_ground_truth=False):
     for im in images:
         bbox = im.landmarks['bbox'].lms.bounds()
         i_dict = {'pixels': as_fortran(im.rolled_channels()),
-                  'bbox': as_fortran(np.array(bbox).ravel())}
+                  'bbox': as_fortran(1 + np.array(bbox)[:, ::-1].ravel())}
         if attach_ground_truth:
-            i_dict['gt'] = as_fortran(im.landmarks['gt'].lms.points)
+            i_dict['gt'] = as_fortran(1 + im.landmarks['gt'].lms.points[:, ::-1])
         image_dicts.append(i_dict)
 
     if not out_path.exists():

diff --git a/menpobench/method/matlab/base.py b/menpobench/method/matlab/base.py
@@ -93,7 +93,8 @@ def load_matlab_results(results_path):
     from menpo.shape import PointCloud
     from scipy.io import loadmat
     results = loadmat(str(results_path / 'menpobench_test_results.mat'))
-    return [BenchResult(PointCloud(r[0])) for r in results['results']]
+    return [BenchResult(PointCloud((r[0] - 1)[:, ::-1]))
+            for r in results['results']]
 
 
 class MatlabWrapper(object):

diff --git a/menpobench/predefined/trainable_method/yzt_iccv_2013.m b/menpobench/predefined/trainable_method/yzt_iccv_2013.m
@@ -90,6 +90,8 @@
 
 %% Fit
 function result = fit(image_data, bbox, model_data)
+    % Convert the image to float greyscale
+    image_data = double(rgb2gray(image_data)) / 255;
     cAAM = model_data;
 
     %% initialization