Visitar URL original
Fixing osx makefile by fgb · Pull Request #4 · matplotlib/matplotlib · GitHub
Skip to content

Fixing osx makefile #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fgb wants to merge 15 commits into from
Closed

Fixing osx makefile #4

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a9f708b
Updated libpng's sourceforge download link since old one was broken.
fgb Feb 20, 2011
9560e0e
Fixed clean, by changing libpng to be a gz instead of bz2.
fgb Feb 20, 2011
e4b38b6
Probably a superfluous change, since the zlib url still worked, but w…
fgb Feb 20, 2011
c658a84
Suggesting PYVERSION be input on the command line
fgb Feb 20, 2011
27a2b23
Removed the PREFIX from mpl_install in order to install into relevant…
fgb Feb 20, 2011
7b47d25
Added some stray files from build process to clean.
fgb Feb 20, 2011
1ab26de
BUG: Get autofmt_xdate to work when used with twinx
scottza Feb 19, 2011
b86140c
BUG: Don't alter current behaviour of autofmt_xdate
scottza Feb 22, 2011
125c332
REV: Attend to code review comments
scottza Feb 23, 2011
411b153
BUG: Incorrect indentation for adjust_subplots
scottza Feb 23, 2011
36708db
Allow setting of default histogram type from matplotlibrc
Feb 21, 2011
ff4a592
clabel accepts callable as fmt kwarg; modified patch by Daniel Hyams
efiring Feb 20, 2011
5cd634e
colors.rgb_to_hsv: don't divide by zero
efiring Feb 21, 2011
d4cea82
add .gitattributes and .gitignore, fix CRLF
ddale Feb 21, 2011
ad96aec
update examples to use sample_data from github
ddale Feb 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
colors.rgb_to_hsv: don't divide by zero
  • Loading branch information
@efiring @fgb
efiring authored and fgb committed Feb 23, 2011
commit 5cd634e278cc409399bef245f5c26f2272539551
14 changes: 8 additions & 6 deletions lib/matplotlib/colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,19 +1053,21 @@ def rgb_to_hsv(arr):
convert rgb values in a numpy array to hsv values
input and output arrays should have shape (M,N,3)
"""
out = np.empty_like(arr)
out = np.zeros_like(arr)
arr_max = arr.max(-1)
ipos = arr_max > 0
delta = arr.ptp(-1)
s = delta / arr_max
s[delta==0] = 0
s = np.zeros_like(delta)
s[ipos] = delta[ipos] / arr_max[ipos]
ipos = delta > 0
# red is max
idx = (arr[:,:,0] == arr_max)
idx = (arr[:,:,0] == arr_max) & ipos
out[idx, 0] = (arr[idx, 1] - arr[idx, 2]) / delta[idx]
# green is max
idx = (arr[:,:,1] == arr_max)
idx = (arr[:,:,1] == arr_max) & ipos
out[idx, 0] = 2. + (arr[idx, 2] - arr[idx, 0] ) / delta[idx]
# blue is max
idx = (arr[:,:,2] == arr_max)
idx = (arr[:,:,2] == arr_max) & ipos
out[idx, 0] = 4. + (arr[idx, 0] - arr[idx, 1] ) / delta[idx]
out[:,:,0] = (out[:,:,0]/6.0) % 1.0
out[:,:,1] = s
Expand Down