diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-08-09 17:06:15 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-08-09 17:06:15 +0000 |
| commit | a7ec2e1016abb19f3b67213b060c9532d0ff38b9 (patch) | |
| tree | 5a060df4d2b905d740d551f3cf2aa70210213785 /src/libnrtype | |
| parent | Fix for 819671 : No visual indication for grid and snap being on/off (diff) | |
| download | inkscape-a7ec2e1016abb19f3b67213b060c9532d0ff38b9.tar.gz inkscape-a7ec2e1016abb19f3b67213b060c9532d0ff38b9.zip | |
Warnings. Fix for Bug #323414 (strict-aliasing rules warnings).
(bzr r11601)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index bf6516b42..4bdd2c6cb 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -342,7 +342,7 @@ static char const *weight_to_text(PangoWeight w) Glib::ustring Layout::getFontFamily(unsigned span_index) const { - if (span_index < 0 || span_index >= _spans.size()) + if (span_index >= _spans.size()) return ""; if (_spans[span_index].font) { @@ -387,11 +387,13 @@ Glib::ustring Layout::dumpAsText() const Glib::ustring::const_iterator iter_char = _spans[span_index].input_stream_first_character; // very inefficent code. what the hell, it's only debug stuff. for (unsigned char_index = 0 ; char_index < _characters.size() ; char_index++) { + union {const PangoLogAttr* pattr; const unsigned* uattr;} u; + u.pattr = &_characters[char_index].char_attributes; if (_characters[char_index].in_span != span_index) continue; if (_input_stream[_spans[span_index].in_input_stream_item]->Type() != TEXT_SOURCE) { - snprintf(line, sizeof(line), " %d: control x=%f flags=%03x glyph=%d\n", char_index, _characters[char_index].x, *(unsigned*) &_characters[char_index].char_attributes, _characters[char_index].in_glyph); + snprintf(line, sizeof(line), " %d: control x=%f flags=%03x glyph=%d\n", char_index, _characters[char_index].x, *u.uattr, _characters[char_index].in_glyph); } else { - snprintf(line, sizeof(line), " %d: '%c' x=%f flags=%03x glyph=%d\n", char_index, *iter_char, _characters[char_index].x, *(unsigned*) &_characters[char_index].char_attributes, _characters[char_index].in_glyph); + snprintf(line, sizeof(line), " %d: '%c' x=%f flags=%03x glyph=%d\n", char_index, *iter_char, _characters[char_index].x, *u.uattr, _characters[char_index].in_glyph); iter_char++; } result += line; |