mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue to implement drawChar for unpatched popplers without drawChar2 hack

Browse Source 
Change-Id: Id4ad86f3f563d88777352722e397cd77cfad45e4
This commit is contained in:
Caolán McNamara
2015-01-20 15:48:05 +00:00
parent 26bd210ccd
commit 37e4920a31
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -2628,6 +2628,10 @@ endif # ENABLE_VALGRIND
ifneq ($(SYSTEM_POPPLER),)
define gb_LinkTarget__use_poppler
$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_POPPLER_HEADERS \
)
$(call gb_LinkTarget_set_include,$(1),\
$(POPPLER_CFLAGS) \
$$(INCLUDE) \

7
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
View File

@@ -834,10 +834,17 @@ void PDFOutDev::eoClip(GfxState *state)
local offset of character (zero for horizontal writing mode). not
taken into account for output pos updates. Used for vertical writing.
*/
#ifdef SYSTEM_POPPLER_HEADERS
void PDFOutDev::drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode, int /*nBytes*/, Unicode *u, int uLen)
#else
void PDFOutDev::drawChar2(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode, int /*nBytes*/, Unicode *u, int uLen)
#endif
{
assert(state);

7
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
View File

@@ -220,10 +220,17 @@ namespace pdfi
virtual void eoClip(GfxState *state) SAL_OVERRIDE;
//----- text drawing
#ifdef SYSTEM_POPPLER_HEADERS
virtual void drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
#else
virtual void drawChar2(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
#endif
virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
virtual void endTextObject(GfxState *state) SAL_OVERRIDE;