diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-08-30 17:23:17 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-08-30 17:23:17 +0000 |
| commit | 77edfe45996574c82f66c2156ce6e8037520c8ff (patch) | |
| tree | 805458831d8f2b17e63793b4f84ad20f447a27d7 /src/color.cpp | |
| parent | Fix make check (diff) | |
| download | inkscape-77edfe45996574c82f66c2156ce6e8037520c8ff.tar.gz inkscape-77edfe45996574c82f66c2156ce6e8037520c8ff.zip | |
Minor pass of header cleanup
(bzr r13341.1.189)
Diffstat (limited to 'src/color.cpp')
| -rw-r--r-- | src/color.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/color.cpp b/src/color.cpp index dccd603b0..da4406748 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -160,7 +160,7 @@ void SPColor::set( guint32 value ) * Convert SPColor with integer alpha value to 32bit RGBA value. * \pre alpha < 256 */ -guint32 SPColor::toRGBA32( gint alpha ) const +guint32 SPColor::toRGBA32( int alpha ) const { g_return_val_if_fail (alpha <= 0xff, 0x0); @@ -175,12 +175,12 @@ guint32 SPColor::toRGBA32( gint alpha ) const * Convert SPColor with float alpha value to 32bit RGBA value. * \pre color != NULL && 0 <= alpha <= 1 */ -guint32 SPColor::toRGBA32( gdouble alpha ) const +guint32 SPColor::toRGBA32( double alpha ) const { g_return_val_if_fail(alpha >= 0.0, 0x0); g_return_val_if_fail(alpha <= 1.0, 0x0); - return toRGBA32( static_cast<gint>(SP_COLOR_F_TO_U(alpha)) ); + return toRGBA32( static_cast<int>(SP_COLOR_F_TO_U(alpha)) ); } std::string SPColor::toString() const @@ -284,7 +284,7 @@ sp_color_rgb_to_hsv_floatv (float *hsv, float r, float g, float b) void sp_color_hsv_to_rgb_floatv (float *rgb, float h, float s, float v) { - gdouble f, w, q, t, d; + double f, w, q, t, d; d = h * 5.99999999; f = d - floor (d); |