From 89dc0ac5ac8582f1164a89bcf4b04a44fe95b944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Sat, 30 Nov 2013 10:23:34 +0100
Subject: [PATCH] Update BRIEF example

---
 skimage/feature/brief.py | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/skimage/feature/brief.py b/skimage/feature/brief.py
index 38ed7061..cac7f347 100644
--- a/skimage/feature/brief.py
+++ b/skimage/feature/brief.py
@@ -47,7 +47,7 @@ class BRIEF(DescriptorExtractor):
     Examples
     --------
     >>> from skimage.feature import (corner_harris, corner_peaks, BRIEF,
-    ...                              match_binary_descriptors)
+    ...                              match_descriptors)
     >>> import numpy as np
     >>> square1 = np.zeros((8, 8), dtype=np.int32)
     >>> square1[2:6, 2:6] = 1
@@ -77,24 +77,19 @@ class BRIEF(DescriptorExtractor):
     >>> extractor = BRIEF(patch_size=5)
     >>> descs1, _ = extractor.extract(square1, keypoints1)
     >>> descs2, _ = extractor.extract(square2, keypoints2)
-    >>> matches, idxs1, idxs2 = match_binary_descriptors(keypoints1, descs1,
-    ...                                                  keypoints2, descs2)
-    >>> matches
-    array([[[2, 2],
-            [2, 2]],
-
-           [[2, 5],
-            [2, 6]],
-
-           [[5, 2],
-            [6, 2]],
-
-           [[5, 5],
-            [6, 6]]])
-    >>> mask1
-    array([0, 1, 2, 3])
-    >>> mask2
-    array([0, 1, 2, 3])
+    >>> idxs1, idxs2 = match_descriptors(descs1, descs2)
+    >>> idxs1, idxs2
+    (array([0, 1, 2, 3]), array([0, 1, 2, 3]))
+    >>> keypoints1[idxs1]
+    array([[2, 2],
+           [2, 5],
+           [5, 2],
+           [5, 5]])
+    >>> keypoints2[idxs2]
+    array([[2, 2],
+           [2, 6],
+           [6, 2],
+           [6, 6]])
 
     """