Skip to content

Commit 4e63682

Browse files
committed
implement PR openframeworks#8172 from OF main
1 parent 514e23f commit 4e63682

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

libs/openFrameworks/types/ofColor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ A clampedMultiply(const A& a, const B& b) {
170170
}
171171

172172
template<typename PixelType>
173-
ofColor_<PixelType>::ofColor_(float _r, float _g, float _b, float _a):
173+
// ofColor_<PixelType>::ofColor_(float _r, float _g, float _b, float _a):
174+
ofColor_<PixelType>::ofColor_(PixelType _r, PixelType _g, PixelType _b, PixelType _a):
174175
r(_r),
175176
g(_g),
176177
b(_b),

libs/openFrameworks/types/ofColor.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ class ofColor_{
3333
/// \param green The green component.
3434
/// \param blue The blue component.
3535
/// \param alpha The alpha component.
36-
ofColor_(float red, float green, float blue, float alpha = limit());
36+
// ofColor_(float red, float green, float blue, float alpha = limit());
37+
ofColor_(PixelType red, PixelType green, PixelType blue, PixelType alpha = limit());
38+
39+
3740

3841
/// \brief Construct a grayscale ofColor_ by specifying a single number.
3942
///

0 commit comments

Comments
 (0)