← Back to branch summary

~ubuntu-branches/debian/sid/inkscape/sid

« back to all changes in this revision

Viewing changes to src/extension/internal/pdfinput/svg-builder.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-06-21 15:13:32 UTC
  • mfrom: (10.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20130621151332-uo22shomzjut843h
Tags: 0.48.4-1
http://bugs.debian.org/701297
* Upload to unstable
* debian/control: added myself to Uploaders
* debian/patches/: patchset updated
  - 04-Fix_FTBFS_on_gcc-4.8.patch added (Closes: #701297)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/extension/internal/pdfinput/svg-builder.cpp
961
961
    _font_style = sp_repr_css_attr_new();
962
962
    GfxFont *font = state->getFont();
963
963
    // Store original name
964
 
    if (font->getOrigName()) {
965
 
        _font_specification = font->getOrigName()->getCString();
966
 
    } else if (font->getName()) {
 
964
    if (font->getName()) {
967
965
        _font_specification = font->getName()->getCString();
968
966
    } else {
969
967
        _font_specification = (char*) "Arial";
1443
1441
        return NULL;
1444
1442
    }
1445
1443
    // Set error handler
1446
 
    if (setjmp(png_ptr->jmpbuf)) {
 
1444
    if (setjmp(png_jmpbuf(png_ptr))) {
1447
1445
        png_destroy_write_struct(&png_ptr, &info_ptr);
1448
1446
        return NULL;
1449
1447
    }