Use char type for circle_perimeter method for speedup
Use same cython directives for whole source file
Fix PEP8 issues
Merge pull request #412 from ahojnnes/draw-cython-directives

ENH: Some improvements to draw.
Merge branch 'master' of git://github.com/scikit-image/scikit-image

Conflicts:
	skimage/draw/_draw.pyx
Merge branch 'master' of git://github.com/scikit-image/scikit-image
fix comment
FIX: number of peaks returned from feature.corner_peaks

corner_peaks accepted a num_peaks argument, but the call
to peak_local_max inside the function used np.inf instead
of the value of this keyword argument, leading to an unbounded
number of peaks being returned.
DOC: minor fix ellipse_perim.
Replace scipy.ndimage routine with skimage.ndimage.rotate
Use nearest neighbour interpolation to avoid different labels
Remove unused import
Replace rotate function of local binary pattern example with builtin skimage function
Explicitly import local_binary_pattern function
Replace ndimage.zoom function in radon transform example with builtin skimage function
Merge pull request #470 from ahojnnes/regionprops-example

Replace ndimage with skimage.transform.* functions in examples
TEST: added test for num_peaks kwarg in peak_local_max.
FIX: move corner detection outside loop in test_num_peaks.
FIX: changed xrange to range so Python 3 works.
Merge pull request #467 from malcolmreynolds/fix-num-peaks-typo

FIX: number of peaks returned from feature.corner_peaks