From 980aff5bdb7b5144b11d8111863a0ec016ed9af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jschoenberger@demuc.de>
Date: Sat, 27 Apr 2013 17:14:00 +0200
Subject: [PATCH 1/2] Deprecate bresenham function

---
 skimage/draw/__init__.py | 5 +----
 skimage/draw/_draw.pyx   | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/skimage/draw/__init__.py b/skimage/draw/__init__.py
index 4aa6bf35..0cb0b72a 100644
--- a/skimage/draw/__init__.py
+++ b/skimage/draw/__init__.py
@@ -1,5 +1,2 @@
 from ._draw import line, polygon, ellipse, ellipse_perimeter, \
-                   circle, circle_perimeter, set_color
-
-
-bresenham = line
+                   circle, circle_perimeter, set_color, bresenham
diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx
index ee2b89e0..9dbcd914 100644
--- a/skimage/draw/_draw.pyx
+++ b/skimage/draw/_draw.pyx
@@ -8,6 +8,7 @@ import numpy as np
 cimport numpy as cnp
 from libc.math cimport sqrt
 from skimage._shared.geometry cimport point_in_polygon
+from skimage._shared.utils import deprecated
 
 
 def line(Py_ssize_t y, Py_ssize_t x, Py_ssize_t y2, Py_ssize_t x2):
@@ -73,6 +74,9 @@ def line(Py_ssize_t y, Py_ssize_t x, Py_ssize_t y2, Py_ssize_t x2):
     return rr, cc
 
 
+bresenham = deprecated('skimage.draw.line')(line)
+
+
 def polygon(y, x, shape=None):
     """Generate coordinates of pixels within polygon.
 

From 2b505a33bd4e6b1dc362bbecae5dee9cfb34d060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jschoenberger@demuc.de>
Date: Sat, 27 Apr 2013 17:56:51 +0200
Subject: [PATCH 2/2] Replace all occurences of bresenham with line

---
 doc/examples/plot_skeleton.py                | 4 ++--
 skimage/feature/_hog.py                      | 8 ++++----
 skimage/morphology/tests/test_skeletonize.py | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/examples/plot_skeleton.py b/doc/examples/plot_skeleton.py
index 69d964af..a0bfd267 100644
--- a/doc/examples/plot_skeleton.py
+++ b/doc/examples/plot_skeleton.py
@@ -29,10 +29,10 @@ image[-100:-10, 10:-10] = 1
 image[10:-10, -100:-10] = 1
 
 # foreground object 2
-rs, cs = draw.bresenham(250, 150, 10, 280)
+rs, cs = draw.line(250, 150, 10, 280)
 for i in range(10):
     image[rs + i, cs] = 1
-rs, cs = draw.bresenham(10, 150, 250, 280)
+rs, cs = draw.line(10, 150, 250, 280)
 for i in range(20):
     image[rs + i, cs] = 1
 
diff --git a/skimage/feature/_hog.py b/skimage/feature/_hog.py
index 9fa018b7..a2ece2f0 100644
--- a/skimage/feature/_hog.py
+++ b/skimage/feature/_hog.py
@@ -142,10 +142,10 @@ def hog(image, orientations=9, pixels_per_cell=(8, 8),
                     centre = tuple([y * cy + cy // 2, x * cx + cx // 2])
                     dx = radius * cos(float(o) / orientations * np.pi)
                     dy = radius * sin(float(o) / orientations * np.pi)
-                    rr, cc = draw.bresenham(int(centre[0] - dx),
-                                            int(centre[1] - dy),
-                                            int(centre[0] + dx),
-                                            int(centre[1] + dy))
+                    rr, cc = draw.line(int(centre[0] - dx),
+                                       int(centre[1] - dy),
+                                       int(centre[0] + dx),
+                                       int(centre[1] + dy))
                     hog_image[rr, cc] += orientation_histogram[y, x, o]
 
     """
diff --git a/skimage/morphology/tests/test_skeletonize.py b/skimage/morphology/tests/test_skeletonize.py
index 9c8fe249..4f7c943a 100644
--- a/skimage/morphology/tests/test_skeletonize.py
+++ b/skimage/morphology/tests/test_skeletonize.py
@@ -71,10 +71,10 @@ class TestSkeletonize():
         image[10:-10, -100:-10] = 1
 
         # foreground object 2
-        rs, cs = draw.bresenham(250, 150, 10, 280)
+        rs, cs = draw.line(250, 150, 10, 280)
         for i in range(10):
             image[rs + i, cs] = 1
-        rs, cs = draw.bresenham(10, 150, 250, 280)
+        rs, cs = draw.line(10, 150, 250, 280)
         for i in range(20):
             image[rs + i, cs] = 1