summaryrefslogtreecommitdiffstats
path: root/src/sp-guide.cpp
diff options
context:
space:
mode:
authorDenis Declara <declara91@gmail.com>2012-04-01 15:49:05 +0000
committerDenis Declara <declara91@gmail.com>2012-04-01 15:49:05 +0000
commitab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee (patch)
tree7fb9d8555d36fbdd8e7f1dec13ff46c1f5e160f8 /src/sp-guide.cpp
parentBrought old code, "Rows and Columns" in it's own class. Added a separate clas... (diff)
parentfix XML output of guideline color (diff)
downloadinkscape-ab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee.tar.gz
inkscape-ab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee.zip
Trunk merge
(bzr r11073.1.9)
Diffstat (limited to 'src/sp-guide.cpp')
-rw-r--r--src/sp-guide.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 6cdc75c41..6a71cf4f0 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -440,7 +440,7 @@ void sp_guide_set_normal(SPGuide &guide, Geom::Point const normal_to_line, bool
*/
}
-void sp_guide_set_color(SPGuide &guide, const unsigned char r, const unsigned char g, const unsigned char b, bool const commit)
+void sp_guide_set_color(SPGuide &guide, const unsigned r, const unsigned g, const unsigned b, bool const commit)
{
g_assert(SP_IS_GUIDE(&guide));
guide.color = (r << 24) | (g << 16) | (b << 8) | 0x7f;