summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2007-02-19 18:10:02 +0000
committerjoncruz <joncruz@users.sourceforge.net>2007-02-19 18:10:02 +0000
commitb0cc28bf898225878290d34dc569585847cfff48 (patch)
treef176c3305b05c2ab9027864e0747bfdbc3a136ba /src/extension
parentnow at least the first opening of the first gtkmm dialog opens it in-place wi... (diff)
downloadinkscape-b0cc28bf898225878290d34dc569585847cfff48.tar.gz
inkscape-b0cc28bf898225878290d34dc569585847cfff48.zip
Fixed unintialized variables and minor misc warnings
(bzr r2398)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/internal/cairo-render-context.cpp10
-rw-r--r--src/extension/paramenum.cpp2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 4ade7fbae..47d38fa1d 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -408,8 +408,8 @@ CairoRenderContext::popLayer(void)
SPMask *mask = _state->mask;
if (clip_path || mask) {
- CairoRenderContext *clip_ctx;
- cairo_surface_t *clip_mask;
+ CairoRenderContext *clip_ctx = 0;
+ cairo_surface_t *clip_mask = 0;
if (clip_path) {
if (_render_mode == RENDER_MODE_CLIP)
@@ -1313,7 +1313,11 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, NRMatrix const *font_matrix
cairo_restore(_cr);
cairo_font_face_destroy(font_face);
-#endif
+#else
+ (void)size;
+ (void)fc_pattern;
+#endif
+
return true;
}
diff --git a/src/extension/paramenum.cpp b/src/extension/paramenum.cpp
index bd8d0b14e..1e95a18f0 100644
--- a/src/extension/paramenum.cpp
+++ b/src/extension/paramenum.cpp
@@ -219,7 +219,7 @@ ParamComboBox::get_widget (SPDocument * doc, Inkscape::XML::Node * node)
ParamComboBoxEntry * combo = Gtk::manage(new ParamComboBoxEntry(this, doc, node));
// add choice strings:
- Glib::ustring * settext;
+ Glib::ustring * settext = 0;
for (GSList * list = choices; list != NULL; list = g_slist_next(list)) {
enumentry * entr = reinterpret_cast<enumentry *>(list->data);
Glib::ustring * text = entr->guitext;