← Back to branch summary

~imz/inkscape/lav@altlinux

« back to all changes in this revision

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

  • Committer: Vitaly Lipatov
  • Date: 2013-02-11 16:18:39 UTC
  • Revision ID: git-v1:15c9c30ef309c7ab1b0d9479c2058a0668e6041f
just import inkscape-0.48.4.tar.bz2 with rpmgs script

Show diffs side-by-side

added added

removed removed

Lines of Context:
inkscape/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
    }