Ignore:
Timestamp:
Aug 27, 2010, 11:00:52 AM (11 years ago)
Author:
Silvan Scherrer
Message:

poppler update to 0.14.2

File:
1 edited

Legend:

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

    r277 r461  
    1616// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
    1717// Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
    18 // Copyright (C) 2007-2009 Carlos Garcia Campos <carlosgc@gnome.org>
     18// Copyright (C) 2007-2010 Carlos Garcia Campos <carlosgc@gnome.org>
    1919// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
    2020// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
     
    4646class PDFRectangle;
    4747class Movie;
     48class LinkAction;
    4849class OCGs;
    4950class Sound;
     
    291292  AnnotColor(double r, double g, double b);
    292293  AnnotColor(double c, double m, double y, double k);
    293   AnnotColor(Array *array);
    294   ~AnnotColor();
     294  AnnotColor(Array *array, int adjust = 0);
    295295
    296296  AnnotColorSpace getSpace() const { return (AnnotColorSpace) length; }
    297   double *getValues() const { return values; }
    298 
    299 private:
    300 
    301   double *values;
     297  const double *getValues() const { return values; }
     298
     299private:
     300
     301  double values[4];
    302302  int length;
    303303};
     
    515515  PDFRectangle *getRect() const { return rect; }
    516516  GooString *getContents() const { return contents; }
    517   Dict *getPageDict() const { return pageDict; }
     517  int getPageNum() const { return page; }
    518518  GooString *getName() const { return name; }
    519519  GooString *getModified() const { return modified; }
     
    535535
    536536protected:
    537   void setColor(Array *a, GBool fill, int adjust);
     537  void setColor(AnnotColor *color, GBool fill);
    538538  void drawCircle(double cx, double cy, double r, GBool fill);
    539539  void drawCircleTopLeft(double cx, double cy, double r);
    540540  void drawCircleBottomRight(double cx, double cy, double r);
     541  void createForm(double *bbox, GBool transparencyGroup, Object *resDict, Object *aStream);
     542  void createResourcesDict(char *formName, Object *formStream, char *stateName,
     543                           double opacity, char *blendMode, Object *resDict);
     544  GBool isVisible(GBool printing);
    541545
    542546  // Updates the field key of the annotation dictionary
     
    552556  // optional data
    553557  GooString *contents;              // Contents
    554   Dict *pageDict;                   // P
     558  int       page;                   // P
    555559  GooString *name;                  // NM
    556560  GooString *modified;              // M
     
    671675  ~AnnotText();
    672676
     677  virtual void draw(Gfx *gfx, GBool printing);
     678
    673679  // getters
    674680  GBool getOpen() const { return open; }
     
    698704class AnnotMovie: public Annot {
    699705 public:
    700   enum PosterType {
    701     posterTypeNone,
    702     posterTypeStream,
    703     posterTypeFromMovie
    704   };
    705 
    706   enum RepeatMode {
    707     repeatModeOnce,
    708     repeatModeOpen,
    709     repeatModeRepeat,
    710     repeatModePalindrome
    711   };
    712 
    713   struct Time {
    714     Time() { units_per_second = 0; }
    715     Gulong units;
    716     int units_per_second; // 0 : defined by movie
    717   };
    718 
    719706  AnnotMovie(XRef *xrefA, PDFRectangle *rect, Movie *movieA, Catalog *catalog);
    720707  AnnotMovie(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
    721708  ~AnnotMovie();
    722709
     710  virtual void draw(Gfx *gfx, GBool printing);
     711
    723712  GooString* getTitle() { return title; }
    724   GooString* getFileName() { return fileName; }
    725   int getRotationAngle() { return rotationAngle; }
    726 
    727   PosterType getPosterType() { return posterType; }
    728   Stream* getPosterStream() { return posterStream; }
    729 
    730   Time getStart() { return start; }
    731   Time getDuration() { return duration; }
    732   double getRate() { return rate; }
    733   double getVolume() { return volume; }
    734 
    735   GBool getShowControls() { return showControls; }
    736   RepeatMode getRepeatMode() { return repeatMode; }
    737   GBool getSynchronousPlay() { return synchronousPlay; }
    738 
    739   GBool needFloatingWindow() { return hasFloatingWindow; }
    740   GBool needFullscreen() { return isFullscreen; }
    741  
    742  
    743   void getMovieSize(int& width, int& height);
    744   void getZoomFactor(int& num, int& denum);
    745   void getWindowPosition(double& x, double& y) { x = FWPosX; y = FWPosY; }
    746 
    747713  Movie* getMovie() { return movie; }
    748714
     
    751717
    752718  GooString* title;      // T
    753   GooString* fileName;   // Movie/F
    754 
    755   int width;             // Movie/Aspect
    756   int height;            // Movie/Aspect
    757   int rotationAngle;     // Movie/Rotate
    758 
    759   PosterType posterType; // Movie/Poster
    760   Stream* posterStream;
    761 
    762   Time start;            // A/Start
    763   Time duration;         // A/Duration
    764   double rate;           // A/Rate
    765   double volume;         // A/Volume
    766  
    767   GBool showControls;    // A/ShowControls
    768  
    769   RepeatMode repeatMode; // A/Mode
    770  
    771   GBool synchronousPlay; // A/Synchronous
    772 
    773   // floating window
    774   GBool hasFloatingWindow;
    775   unsigned short FWScaleNum; // A/FWScale
    776   unsigned short FWScaleDenum;
    777   GBool isFullscreen;
    778 
    779   double FWPosX;         // A/FWPosition
    780   double FWPosY;
    781 
    782   Movie* movie;
     719  Movie* movie;          // Movie + A
    783720};
    784721
     
    798735
    799736  AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
    800   Object* getAction() { return &action; }
     737  LinkAction* getAction() { return action; }
    801738  Object* getAdditionActions() { return &additionAction; }
    802739
     
    809746  AnnotAppearanceCharacs* appearCharacs; // MK
    810747
    811   Object action;                         // A
     748  LinkAction *action;                    // A
    812749  Object additionAction;                 // AA
    813750};
     
    926863  AnnotLine(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
    927864  ~AnnotLine();
     865
     866  virtual void draw(Gfx *gfx, GBool printing);
    928867
    929868  // getters
     
    981920  virtual ~AnnotTextMarkup();
    982921
     922  virtual void draw(Gfx *gfx, GBool printing);
     923
    983924  AnnotQuadrilaterals *getQuadrilaterals() const { return quadrilaterals; }
    984925
     
    1021962  AnnotGeometry(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
    1022963  ~AnnotGeometry();
     964
     965  virtual void draw(Gfx *gfx, GBool printing);
    1023966
    1024967  // getters
     
    11471090  ~AnnotFileAttachment();
    11481091
     1092  virtual void draw(Gfx *gfx, GBool printing);
     1093
    11491094  // getters
    11501095  Object *getFile() { return &file; }
     
    11721117  AnnotSound(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
    11731118  ~AnnotSound();
     1119
     1120  virtual void draw(Gfx *gfx, GBool printing);
    11741121
    11751122  // getters
Note: See TracChangeset for help on using the changeset viewer.