diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-06-06 17:15:26 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-06-06 17:15:26 +0000 |
| commit | 0cbf1e83f2a78036ae473b0a173d416acf52efd8 (patch) | |
| tree | 7353975af4ca1b881ac61bc482046549d1ffcc42 /src/extension | |
| parent | Remove silly code ;) (diff) | |
| parent | Fix build with versions of Harfbuzz prior to 1.2.3. (Visualization of alterna... (diff) | |
| download | inkscape-0cbf1e83f2a78036ae473b0a173d416acf52efd8.tar.gz inkscape-0cbf1e83f2a78036ae473b0a173d416acf52efd8.zip | |
Update to trunk
(bzr r15715)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/wmf-print.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index a57396b17..2ee713085 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -946,8 +946,8 @@ void PdfInput::init(void) { "<input>\n" "<extension>.pdf</extension>\n" "<mimetype>application/pdf</mimetype>\n" - "<filetypename>" N_("Adobe PDF (*.pdf)") "</filetypename>\n" - "<filetypetooltip>" N_("Adobe Portable Document Format") "</filetypetooltip>\n" + "<filetypename>" N_("Portable Document Format (*.pdf)") "</filetypename>\n" + "<filetypetooltip>" N_("Portable Document Format") "</filetypetooltip>\n" "</input>\n" "</inkscape-extension>", new PdfInput()); diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 6dd9d895e..29dfa2716 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -312,7 +312,7 @@ unsigned int PrintWmf::finish(Inkscape::Extension::Print * /*mod*/) g_error("Fatal programming error in PrintWmf::finish"); } (void) wmf_finish(wt); // Finalize and write out the WMF - wmf_free(&wt); // clean up + uwmf_free(&wt); // clean up wmf_htable_free(&wht); // clean up return 0; |