summaryrefslogtreecommitdiffstats
path: root/src/color.cpp
diff options
context:
space:
mode:
authorAndrew Higginson <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
committerAndrew <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
commit80960b623a99aae1402ab651b2974ef544ed3b03 (patch)
treeba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/color.cpp
parenttry to fix bug (diff)
parentGDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff)
downloadinkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz
inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/color.cpp')
-rw-r--r--src/color.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/color.cpp b/src/color.cpp
index 54af89ae5..ca5d50f14 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -1,6 +1,4 @@
-#define __SP_COLOR_C__
-
-/** \file
+/*
* Colors.
*
* Author:
@@ -185,8 +183,6 @@ guint32 SPColor::toRGBA32( gdouble alpha ) const
std::string SPColor::toString() const
{
CSSOStringStream css;
-
- std::string result;
char tmp[64] = {0};
sp_svg_write_color(tmp, sizeof(tmp), toRGBA32(0x0ff));