From 34b1b7b4143868a9ab16c7f46d6edf3f2175fe13 Mon Sep 17 00:00:00 2001
From: Juan Nunez-Iglesias <jni@janelia.hhmi.org>
Date: Sat, 7 Sep 2013 00:51:21 +1000
Subject: [PATCH 1/2] Fix errors in relabel_from_one docs; PEP8

---
 skimage/segmentation/_join.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/skimage/segmentation/_join.py b/skimage/segmentation/_join.py
index 454da71e..4afc3a66 100644
--- a/skimage/segmentation/_join.py
+++ b/skimage/segmentation/_join.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+
 def join_segmentations(s1, s2):
     """Return the join of the two input segmentations.
 
@@ -41,6 +42,7 @@ def join_segmentations(s1, s2):
     j = relabel_from_one(j)[0]
     return j
 
+
 def relabel_from_one(label_field):
     """Convert labels in an arbitrary label field to {1, ... number_of_labels}.
 
@@ -50,14 +52,29 @@ def relabel_from_one(label_field):
 
     Parameters
     ----------
-    label_field : numpy ndarray (integer type)
+    label_field : numpy array of int, arbitrary shape
 
     Returns
     -------
-    relabeled : numpy array of same shape as ar
-    forward_map : 1d numpy array of length np.unique(ar) + 1
-    inverse_map : 1d numpy array of length len(np.unique(ar))
-        The length is len(np.unique(ar)) + 1 if 0 is not in np.unique(ar)
+    relabeled : numpy array of int, same shape as `label_field`
+        The input label field with labels mapped to
+        {1, ..., number_of_labels}.
+    forward_map : numpy array of int, shape ``(label_field.max() + 1,)``
+        The map from the original label space to the returned label
+        space. Can be used to re-apply the same mapping. See examples
+        for usage.
+    inverse_map : numpy array of int, shape ``(len(np.unique(label_field)),)``
+        The map from the new label space to the original space. This
+        can be used to reconstruct the original label field from the
+        relabeled one.
+
+    Notes
+    -----
+    The forward map can be extremely big for some inputs, since its
+    length is given by the maximum of the label field. However, in most
+    situations, `label_field.max()` is much smaller than
+    `label_field.size`, and in these cases the forward map is
+    guaranteed to be smaller than either the input or output images.
 
     Examples
     --------
@@ -91,3 +108,4 @@ def relabel_from_one(label_field):
         labels = np.concatenate(([0], labels))
     inverse_map = labels
     return forward_map[label_field], forward_map, inverse_map
+

From 54530d16f6740bc486d288799ef1902803e098a8 Mon Sep 17 00:00:00 2001
From: Juan Nunez-Iglesias <jni@janelia.hhmi.org>
Date: Sun, 22 Sep 2013 13:37:04 +1000
Subject: [PATCH 2/2] Update snippets in notes to use double backticks

---
 skimage/segmentation/_join.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skimage/segmentation/_join.py b/skimage/segmentation/_join.py
index 4afc3a66..b726c81e 100644
--- a/skimage/segmentation/_join.py
+++ b/skimage/segmentation/_join.py
@@ -72,8 +72,8 @@ def relabel_from_one(label_field):
     -----
     The forward map can be extremely big for some inputs, since its
     length is given by the maximum of the label field. However, in most
-    situations, `label_field.max()` is much smaller than
-    `label_field.size`, and in these cases the forward map is
+    situations, ``label_field.max()`` is much smaller than
+    ``label_field.size``, and in these cases the forward map is
     guaranteed to be smaller than either the input or output images.
 
     Examples