Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
Details
Details
- Reviewers
aacid - Group Reviewers
Calligra: 3.0 - Commits
- R8:a615718222f8: Fix build with poppler>=0.69
R8:56bd4bab320b: Fix build with poppler>=0.69
Builds with poppler 0.67 and with 0.70
Diff Detail
Diff Detail
- Repository
- R8 Calligra
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Comment Actions
i'm really wondering how broken SvgOutputDev.h is since we've changed the API a bit i think. If it's not using override i guess suddenly stopped overriding functions and noone realized...
Comment Actions
Build failure:
https://build.neon.kde.org/job/bionic_stable_extras_calligra_bin_amd64/15/console
00:38:25 [ 65%] Building CXX object filters/karbon/pdf/CMakeFiles/calligra_filter_pdf2svg.dir/SvgOutputDev.cpp.o
00:38:25 filters/karbon/pdf/CMakeFiles/calligra_filter_pdf2svg.dir/build.make:110: recipe for target 'filters/karbon/pdf/CMakeFiles/calligra_filter_pdf2svg.dir/SvgOutputDev.cpp.o' failed
00:38:25 make[3]: Leaving directory '/workspace/build/obj-x86_64-linux-gnu'
00:38:25 /workspace/build/filters/karbon/pdf/SvgOutputDev.cpp: In member function ‘virtual void SvgOutputDev::drawString(GfxState*, GooString*)’:
00:38:25 /workspace/build/filters/karbon/pdf/SvgOutputDev.cpp:412:89: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
00:38:25 int n = font->getNextChar(p, len, &code, &u, &uLen, &dx, &dy, &originX, &originY);
00:38:25 ^
00:38:25 In file included from /workspace/build/filters/karbon/pdf/SvgOutputDev.cpp:27:0:
00:38:25 /usr/include/poppler/GfxFont.h:269:15: note: initializing argument 1 of ‘virtual int GfxFont::getNextChar(char*, int, CharCode*, Unicode, int*, double*, double*, double*, double*)’
00:38:25 virtual int getNextChar(char *s, int len, CharCode *code,
00:38:25 ^~~~~~~~~~~
00:38:25 make[3]: * [filters/karbon/pdf/CMakeFiles/calligra_filter_pdf2svg.dir/SvgOutputDev.cpp.o] Error 1
00:38:25 CMakeFiles/Makefile2:39059: recipe for target 'filters/karbon/pdf/CMakeFiles/calligra_filter_pdf2svg.dir/all' failed