]>
Commit | Line | Data |
---|---|---|
1b7df6e5 JR |
1 | --- scribus-1.5.5/scribus/plugins/import/pdf/slaoutput.h~ 2020-08-01 12:12:08.000000000 +0200 |
2 | +++ scribus-1.5.5/scribus/plugins/import/pdf/slaoutput.h 2020-08-01 12:15:46.683302925 +0200 | |
3 | @@ -229,7 +229,7 @@ | |
4 | \r | |
5 | //----- image drawing\r | |
6 | void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;\r | |
7 | - void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;\r | |
8 | + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg);\r | |
9 | void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,\r | |
10 | int width, int height,\r | |
11 | GfxImageColorMap *colorMap,\r | |
12 | @@ -261,8 +261,8 @@ | |
13 | //----- text drawing\r | |
14 | void beginTextObject(GfxState *state) override;\r | |
15 | void endTextObject(GfxState *state) override;\r | |
16 | - void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;\r | |
17 | - GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;\r | |
18 | + void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/);\r | |
19 | + GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);\r | |
20 | void endType3Char(GfxState * /*state*/) override;\r | |
21 | void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;\r | |
22 | void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;\r |