diff options
| author | Ralf Stephan <ralf@ark.in-berlin.de> | 2006-05-30 10:06:47 +0000 |
|---|---|---|
| committer | rwst <rwst@users.sourceforge.net> | 2006-05-30 10:06:47 +0000 |
| commit | 0d7552b26e89bf8f5dc0690e35889f582b9ffb01 (patch) | |
| tree | 20873c6a721463b345467880de30226a3122fee5 /src/sp-flowtext.cpp | |
| parent | revert patch 12062:12063, deemed unsafe, with better alternatives (diff) | |
| download | inkscape-0d7552b26e89bf8f5dc0690e35889f582b9ffb01.tar.gz inkscape-0d7552b26e89bf8f5dc0690e35889f582b9ffb01.zip | |
removing some gcc4.1 warnings the right way
(bzr r1082)
Diffstat (limited to 'src/sp-flowtext.cpp')
| -rw-r--r-- | src/sp-flowtext.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index a16123901..3e4568de0 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -558,9 +558,11 @@ void SPFlowtext::convert_to_text() if (set_y) sp_repr_set_svg_double(span_tspan, "y", anchor_point[NR::Y]); - SPObject *source_obj; + SPObject *source_obj = 0; + void *rawptr = 0; Glib::ustring::iterator span_text_start_iter; - group->layout.getSourceOfCharacter(it, (void**)&source_obj, &span_text_start_iter); + group->layout.getSourceOfCharacter(it, &rawptr, &span_text_start_iter); + source_obj = SP_OBJECT (rawptr); gchar *style_text = sp_style_write_difference((SP_IS_STRING(source_obj) ? source_obj->parent : source_obj)->style, group->style); if (style_text && *style_text) { span_tspan->setAttribute("style", style_text); @@ -569,9 +571,11 @@ void SPFlowtext::convert_to_text() if (SP_IS_STRING(source_obj)) { Glib::ustring *string = &SP_STRING(source_obj)->string; - SPObject *span_end_obj; + SPObject *span_end_obj = 0; + void *rawptr = 0; Glib::ustring::iterator span_text_end_iter; - group->layout.getSourceOfCharacter(it_span_end, (void**)&span_end_obj, &span_text_end_iter); + group->layout.getSourceOfCharacter(it_span_end, &rawptr, &span_text_end_iter); + span_end_obj = SP_OBJECT(rawptr); if (span_end_obj != source_obj) { if (it_span_end == group->layout.end()) { span_text_end_iter = span_text_start_iter; |