Merge remote-tracking branch 'origin/master' into v0.12.x

skimage/restoration/__init__.py

@@ -23,6 +23,7 @@ from .unwrap import unwrap_phase
 from ._denoise import denoise_tv_chambolle, denoise_tv_bregman, \
                       denoise_bilateral
 from .non_local_means import denoise_nl_means
+from .inpaint import inpaint_biharmonic
 from .._shared.utils import copy_func, deprecated
 
 nl_means_denoising = copy_func(denoise_nl_means, name='nl_means_denoising')
@@ -37,6 +38,7 @@ __all__ = ['wiener',
            'denoise_tv_chambolle',
            'denoise_bilateral',
            'denoise_nl_means',
-           'nl_means_denoising']
+           'nl_means_denoising',
+           'inpaint_biharmonic']
 
 del copy_func, deprecated

skimage/restoration/inpaint.py

@@ -92,6 +92,12 @@ def inpaint_biharmonic(img, mask, multichannel=False):
     out : (M[, N[, ..., P]][, C]) ndarray
         Input image with masked pixels inpainted.
 
+    References
+    ----------
+    .. [1]  N.S.Hoang, S.B.Damelin, "On surface completion and image inpainting
+            by biharmonic functions: numerical aspects",
+            http://www.ima.umn.edu/~damelin/biharmonic
+
     Examples
     --------
     >>> img = np.tile(np.square(np.linspace(0, 1, 5)), (5, 1))
@@ -100,13 +106,6 @@ def inpaint_biharmonic(img, mask, multichannel=False):
     >>> mask[1, 3:] = 1
     >>> mask[0, 4:] = 1
     >>> out = inpaint_biharmonic(img, mask)
-
-    References
-    ----------
-    Algorithm is based on:
-    .. [1]  N.S.Hoang, S.B.Damelin, "On surface completion and image inpainting
-            by biharmonic functions: numerical aspects",
-            http://www.ima.umn.edu/~damelin/biharmonic
     """
 
     if img.ndim < 1: