diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-29 10:01:26 +0000 |
| commit | 3630eed967e5b7020d1c1fc1b14fcf9819103d46 (patch) | |
| tree | 2ff0fa96e32bb6aec2c208845c81cb9a19c780a9 /src/widgets/eek-preview.cpp | |
| parent | merge from trunk (r11826) (diff) | |
| parent | Fix for 165865 : Markers - fix Undo history (diff) | |
| download | inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.tar.gz inkscape-3630eed967e5b7020d1c1fc1b14fcf9819103d46.zip | |
merge from trunk (r11850)
(bzr r11668.1.36)
Diffstat (limited to 'src/widgets/eek-preview.cpp')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index 953beb69d..72db91373 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -229,9 +229,14 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr) GtkAllocation allocation; gtk_widget_get_allocation(widget, &allocation); EekPreview* preview = EEK_PREVIEW(widget); - GdkColor fg = { 0, preview->_r, preview->_g, preview->_b }; - gint insetTop = 0, insetBottom = 0; - gint insetLeft = 0, insetRight = 0; + + GdkColor fg = { 0, + static_cast<guint16>(preview->_r), + static_cast<guint16>(preview->_g), + static_cast<guint16>(preview->_b)}; + + gint insetTop = 0, insetBottom = 0; + gint insetLeft = 0, insetRight = 0; if (preview->_border == BORDER_SOLID) { insetTop = 1; |