diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-11-05 10:04:17 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-11-05 10:04:17 +0000 |
| commit | b46cc1a396cacef9d38411aa7639518afaebf891 (patch) | |
| tree | d88a76868f262316598f5b04d8678f7ad179ccb9 | |
| parent | Various fixes: initialization, memory leak, wrong iterator usage (diff) | |
| download | inkscape-b46cc1a396cacef9d38411aa7639518afaebf891.tar.gz inkscape-b46cc1a396cacef9d38411aa7639518afaebf891.zip | |
Minor code safety and warning cleanup.
(bzr r10722)
| -rw-r--r-- | src/measure-context.cpp | 8 | ||||
| -rw-r--r-- | src/seltrans.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 1197927f4..8d33608a0 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -392,11 +392,10 @@ static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEv } { - SPCanvasItem *canvas_tooltip; // TODO cleanup memory, Glib::ustring, etc.: char* angle_str = static_cast<char*>(malloc(20)); sprintf(angle_str, "%.2f °", angle * 180/M_PI); - canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, end_point + desktop->w2d(Geom::Point(5*fontsize,0)), angle_str); + SPCanvasItem *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, end_point + desktop->w2d(Geom::Point(5*fontsize,0)), angle_str); sp_canvastext_set_fontsize(SP_CANVASTEXT(canvas_tooltip), fontsize); SP_CANVASTEXT(canvas_tooltip)->rgba = 0xffffffff; SP_CANVASTEXT(canvas_tooltip)->rgba_background = 0x337f337f; @@ -405,13 +404,14 @@ static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEv measure_tmp_items.push_back(desktop->add_temporary_canvasitem(canvas_tooltip, 0)); free(angle_str); - + } + { double totallengthval = (end_point - start_point).length(); sp_convert_distance(&totallengthval, &sp_unit_get_by_id(SP_UNIT_PX), &unit); char* totallength_str = static_cast<char*>(malloc(20)); sprintf(totallength_str, "%.2f %s", totallengthval, unit.abbr); - canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, end_point + desktop->w2d(Geom::Point(5*fontsize,-2*fontsize)), totallength_str); + SPCanvasItem *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop), desktop, end_point + desktop->w2d(Geom::Point(5*fontsize,-2*fontsize)), totallength_str); sp_canvastext_set_fontsize(SP_CANVASTEXT(canvas_tooltip), fontsize); SP_CANVASTEXT(canvas_tooltip)->rgba = 0xffffffff; SP_CANVASTEXT(canvas_tooltip)->rgba_background = 0x3333337f; diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 4889f7dc1..84cd5574e 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1599,7 +1599,7 @@ Geom::Point Inkscape::SelTrans::_calcAbsAffineGeom(Geom::Scale const geom_scale) return _calcAbsAffineDefault(geom_scale); // this is bogus, but we must return _something_ } -void Inkscape::SelTrans::_keepClosestPointOnly(Geom::Point const &p, bool const translating) +void Inkscape::SelTrans::_keepClosestPointOnly(Geom::Point const &p, bool const /*translating*/) { SnapManager const &m = _desktop->namedview->snap_manager; |