Skip to content

Fix warning 'conflicts with same method from another category' #42

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

Open
timothycosta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix warning 'conflicts with same method from another category' #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions EDColor/UIColor+HSL.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ - (UIColor *)offsetWithHue:(CGFloat)hue saturation:(CGFloat)saturation lightness

// Calculate offsets
hue = fmodf(hue + h, 1.0f);
saturation = [self clamp:(saturation + s)];
lightness = [self clamp:(lightness + l)];
alpha = [self clamp:(alpha + a)];
saturation = clamp(saturation + s);
lightness = clamp(lightness + l);
alpha = clamp(alpha + a);

return [UIColor colorWithHue:hue saturation:saturation lightness:lightness alpha:alpha];
}
Expand Down Expand Up @@ -75,16 +75,16 @@ - (UIColor *)spin:(CGFloat)angle
/**
* Ternary clamp (0.0f to 1.0f)
*
* @param {CGFloat} Input
* @param a Input
*
* @return {CGFloat}
*/
- (CGFloat)clamp:(CGFloat)a
static CGFloat clamp (CGFloat a)
{
static const CGFloat min = 0.0f;
static const CGFloat max = 1.0f;
return (a > max) ? max : ((a < min) ? min : a);
static const CGFloat min = 0.0f;
static const CGFloat max = 1.0f;

return (a > max) ? max : ((a < min) ? min : a);
}

/**
Expand Down