Ignore:
Timestamp:
Dec 30, 2009, 7:13:45 PM (12 years ago)
Author:
rbri
Message:

PDF plugin: Poppler library updated to version 0.12.3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/PSOutputDev.h

    r263 r277  
    1818// Copyright (C) 2006-2008 Albert Astals Cid <aacid@kde.org>
    1919// Copyright (C) 2007 Brad Hards <bradh@kde.org>
     20// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
     21// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
     22// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
     23// Copyright (C) 2009 William Bader <williambader@hotmail.com>
    2024//
    2125// To see a description of the changes please see the Changelog file that
     
    3135#endif
    3236
    33 #include <poppler-config.h>
     37#include "poppler-config.h"
    3438#include <stddef.h>
    3539#include "Object.h"
     40#include "GfxState.h"
    3641#include "GlobalParams.h"
    3742#include "OutputDev.h"
     
    5459  psModePS,
    5560  psModeEPS,
    56   psModeForm
     61  psModeForm,
     62  psModePSOrigPageSizes
    5763};
    5864
     
    125131  // text in Type 3 fonts will be drawn with drawChar/drawString.
    126132  virtual GBool interpretType3Chars() { return gFalse; }
     133
     134  // This device now supports text in pattern colorspace!
     135  virtual GBool supportTextCSPattern(GfxState *state)
     136        { return state->getFillColorSpace()->getMode() == csPattern; }
    127137
    128138  //----- header/trailer (used only if manualCtrl is true)
     
    200210  virtual void fill(GfxState *state);
    201211  virtual void eoFill(GfxState *state);
    202   virtual void tilingPatternFill(GfxState *state, Object *str,
    203                                  int paintType, Dict *resDict,
    204                                  double *mat, double *bbox,
    205                                  int x0, int y0, int x1, int y1,
    206                                  double xStep, double yStep);
     212  virtual GBool tilingPatternFill(GfxState *state, Object *str,
     213                                  int paintType, Dict *resDict,
     214                                  double *mat, double *bbox,
     215                                  int x0, int y0, int x1, int y1,
     216                                  double xStep, double yStep);
    207217  virtual GBool functionShadedFill(GfxState *state,
    208218                                   GfxFunctionShading *shading);
    209   virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);
    210   virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading);
     219  virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double /*tMin*/, double /*tMax*/);
     220  virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double /*sMin*/, double /*sMax*/);
    211221
    212222  //----- path clipping
     
    217227  //----- text drawing
    218228  virtual void drawString(GfxState *state, GooString *s);
     229  virtual void beginTextObject(GfxState *state);
     230  virtual GBool deviceHasTextClip(GfxState *state) { return haveTextClip && haveCSPattern; }
    219231  virtual void endTextObject(GfxState *state);
    220232
     
    222234  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
    223235                             int width, int height, GBool invert,
    224                              GBool inlineImg);
     236                             GBool interpolate, GBool inlineImg);
    225237  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
    226238                         int width, int height, GfxImageColorMap *colorMap,
    227                          int *maskColors, GBool inlineImg);
     239                         GBool interpolate, int *maskColors, GBool inlineImg);
    228240  virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
    229241                               int width, int height,
    230242                               GfxImageColorMap *colorMap,
     243                               GBool interpolate,
    231244                               Stream *maskStr, int maskWidth, int maskHeight,
    232                                GBool maskInvert);
     245                               GBool maskInvert, GBool maskInterpolate);
     246  // If current colorspace ist pattern,
     247  // need this device special handling for masks in pattern colorspace?
     248  // Default is false
     249  virtual GBool fillMaskCSPattern(GfxState * state)
     250        { return state->getFillColorSpace()->getMode() == csPattern && (level != psLevel1 && level != psLevel1Sep); }
     251  virtual void endMaskClip(GfxState * /*state*/);
    233252
    234253#if OPI_SUPPORT
     
    296315  void addCustomColor(GfxSeparationColorSpace *sepCS);
    297316  void doPath(GfxPath *path);
     317  void maskToClippingPath(Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert);
    298318  void doImageL1(Object *ref, GfxImageColorMap *colorMap,
    299319                 GBool invert, GBool inlineImg,
     
    334354  int paperWidth;               // width of paper, in pts
    335355  int paperHeight;              // height of paper, in pts
     356  int prevWidth;                // width of previous page
     357                                // (only psModePSOrigPageSizes output mode)
     358  int prevHeight;               // height of previous page
     359                                // (only psModePSOrigPageSizes output mode)
    336360  int imgLLX, imgLLY,           // imageable area, in pts
    337361      imgURX, imgURY;
     362  GBool substFonts;             // substitute missing fonts
    338363  GBool preload;                // load all images into memory, and
    339364                                //   predefine forms
     
    401426  GBool haveTextClip;           // set if text has been drawn with a
    402427                                //   clipping render mode
     428  GBool haveCSPattern;          // set if text has been drawn with a
     429                                //   clipping render mode because of pattern colorspace
     430  int savedRender;              // use if pattern colorspace
    403431
    404432  GBool inType3Char;            // inside a Type 3 CharProc
Note: See TracChangeset for help on using the changeset viewer.