Rmys
66 lines
3.0 KiB
Diff
66 lines
3.0 KiB
Diff
diff -up ./src/extension/internal/pdfinput/pdf-input.cpp.orig ./src/extension/internal/pdfinput/pdf-input.cpp
|
|
--- ./src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-12-08 20:29:53.411394981 +0200
|
|
+++ ./src/extension/internal/pdfinput/pdf-input.cpp 2018-12-08 20:32:35.675968747 +0200
|
|
@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc
|
|
_render_thumb = true;
|
|
|
|
// Create PopplerDocument
|
|
- Glib::ustring filename = _pdf_doc->getFileName()->getCString();
|
|
+ Glib::ustring filename = _pdf_doc->getFileName()->c_str();
|
|
if (!Glib::path_is_absolute(filename)) {
|
|
filename = Glib::build_filename(Glib::get_current_dir(),filename);
|
|
}
|
|
diff -up ./src/extension/internal/pdfinput/pdf-parser.cpp.orig ./src/extension/internal/pdfinput/pdf-parser.cpp
|
|
--- ./src/extension/internal/pdfinput/pdf-parser.cpp.orig 2018-12-08 20:29:53.414394969 +0200
|
|
+++ ./src/extension/internal/pdfinput/pdf-parser.cpp 2018-12-08 20:32:35.683968735 +0200
|
|
@@ -2381,8 +2381,8 @@ void PdfParser::opSetFont(Object args[],
|
|
}
|
|
if (printCommands) {
|
|
printf(" font: tag=%s name='%s' %g\n",
|
|
- font->getTag()->getCString(),
|
|
- font->getName() ? font->getName()->getCString() : "???",
|
|
+ font->getTag()->c_str(),
|
|
+ font->getName() ? font->getName()->c_str() : "???",
|
|
args[1].getNum());
|
|
fflush(stdout);
|
|
}
|
|
@@ -2639,7 +2639,7 @@ void PdfParser::doShowText(GooString *s)
|
|
double lineX = state->getLineX();
|
|
double lineY = state->getLineY();
|
|
oldParser = parser;
|
|
- p = s->getCString();
|
|
+ p = s->c_str();
|
|
len = s->getLength();
|
|
while (len > 0) {
|
|
n = font->getNextChar(p, len, &code,
|
|
@@ -2694,7 +2694,7 @@ void PdfParser::doShowText(GooString *s)
|
|
|
|
} else {
|
|
state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
|
|
- p = s->getCString();
|
|
+ p = s->c_str();
|
|
len = s->getLength();
|
|
while (len > 0) {
|
|
n = font->getNextChar(p, len, &code,
|
|
diff -up ./src/extension/internal/pdfinput/svg-builder.cpp.orig ./src/extension/internal/pdfinput/svg-builder.cpp
|
|
--- ./src/extension/internal/pdfinput/svg-builder.cpp.orig 2018-12-08 20:29:53.412394977 +0200
|
|
+++ ./src/extension/internal/pdfinput/svg-builder.cpp 2018-12-08 20:32:35.678968742 +0200
|
|
@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *st
|
|
GfxFont *font = state->getFont();
|
|
// Store original name
|
|
if (font->getName()) {
|
|
- _font_specification = font->getName()->getCString();
|
|
+ _font_specification = font->getName()->c_str();
|
|
} else {
|
|
_font_specification = "Arial";
|
|
}
|
|
@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *st
|
|
|
|
// Font family
|
|
if (font->getFamily()) { // if font family is explicitly given use it.
|
|
- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString());
|
|
+ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str());
|
|
} else {
|
|
int attr_value = 1;
|
|
sp_repr_get_int(_preferences, "localFonts", &attr_value);
|