diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | kdvi/squeeze.c | 3 | ||||
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/admin b/admin -Subproject 5e534df05ac92926f2a4da14e60a7b32681581f +Subproject c5527c8d97c5c97320ea07d88590ff2c43c76bc diff --git a/kdvi/squeeze.c b/kdvi/squeeze.c index d0e2515f..90268241 100644 --- a/kdvi/squeeze.c +++ b/kdvi/squeeze.c @@ -35,7 +35,9 @@ * as a constant string. */ #include <stdio.h> +#include <stdlib.h> #include <string.h> + #define LINELENGTH (72) #define BUFLENGTH (1000) #undef putchar @@ -107,7 +109,6 @@ int main(int argc, char *argv[]) int c ; char *b ; char seeking ; - extern void exit() ; if (argc > 3 || (in=(argc < 2 ? stdin : fopen(argv[1], "r")))==NULL || (out=(argc < 3 ? stdout : fopen(argv[2], "w")))==NULL) { diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp index 54f198e9..a2463362 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp @@ -124,7 +124,11 @@ TQImage Page::renderToImage(double xres, double yres, bool doLinks) const TQString Page::getText(const Rectangle &r) const { TextOutputDev *output_dev; +# if (POPPLER_VERSION_C >= 25001000) + GooString s; +# else GooString *s; +# endif const PDFRectangle *rect; TQString result; ::Page *p; @@ -151,10 +155,16 @@ TQString Page::getText(const Rectangle &r) const s = output_dev->getText(r.m_x1, y1, r.m_x2, y2); } +# if (POPPLER_VERSION_C >= 25001000) + result = TQString::fromUtf8(s.GOO_GET_CSTR()); +# else result = TQString::fromUtf8(s->GOO_GET_CSTR()); +# endif delete output_dev; +# if (POPPLER_VERSION_C < 25001000) delete s; +# endif return result; } |