Ignore:
Timestamp:
Dec 27, 2011, 10:39:53 PM (10 years ago)
Author:
Silvan Scherrer
Message:

Lucide: updated fontconfig and poppler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/TextOutputDev.cc

    r470 r497  
    1111// Modified under the Poppler project - http://poppler.freedesktop.org
    1212//
     13// All changes made under the Poppler project to this file are licensed
     14// under GPL version 2 or later
     15//
    1316// Copyright (C) 2005-2007 Kristian HÞgsberg <krh@redhat.com>
    1417// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
    15 // Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc@gnome.org>
     18// Copyright (C) 2006-2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
    1619// Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
    1720// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
    1821// Copyright (C) 2007, 2008 Adrian Johnson <ajohnson@redneon.com>
    1922// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
    20 // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
     23// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
    2124// Copyright (C) 2008 Pino Toscano <pino@kde.org>
    2225// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
     
    2528// Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
    2629// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
     30// Copyright (C) 2011 Sam Liao <phyomh@gmail.com>
    2731//
    2832// To see a description of the changes please see the Changelog file that
     
    5862#include "TextOutputDev.h"
    5963#include "Page.h"
     64#include "Annot.h"
    6065#include "PDFDocEncoding.h"
    6166
     
    184189public:
    185190
    186   TextLink(int xMinA, int yMinA, int xMaxA, int yMaxA, Link *linkA)
     191  TextLink(int xMinA, int yMinA, int xMaxA, int yMaxA, AnnotLink *linkA)
    187192    { xMin = xMinA; yMin = yMinA; xMax = xMaxA; yMax = yMaxA; link = linkA; }
    188193  ~TextLink() {}
    189194
    190195  int xMin, yMin, xMax, yMax;
    191   Link *link;
     196  AnnotLink *link;
    192197};
    193198
     
    220225GBool TextFontInfo::matches(GfxState *state) {
    221226  return state->getFont() == gfxFont;
     227}
     228
     229GBool TextFontInfo::matches(TextFontInfo *fontInfo) {
     230  return gfxFont == fontInfo->gfxFont;
    222231}
    223232
     
    23372346}
    23382347
    2339 void TextPage::addLink(int xMin, int yMin, int xMax, int yMax, Link *link) {
     2348void TextPage::addLink(int xMin, int yMin, int xMax, int yMax, AnnotLink *link) {
    23402349  links->append(new TextLink(xMin, yMin, xMax, yMax, link));
    23412350}
     
    35923601  GooString *s;
    35933602  UnicodeMap *uMap;
    3594   GBool isUnicode;
    35953603  TextBlock *blk;
    35963604  TextLine *line;
     
    36313639  }
    36323640
    3633   isUnicode = uMap->isUnicode();
    36343641  spaceLen = uMap->mapUnicode(0x20, space, sizeof(space));
    36353642  eolLen = 0; // make gcc happy
     
    39173924  TextLineFrag *frag;
    39183925  int i, j;
    3919   GBool multiLine;
    39203926  UnicodeMap *uMap;
    39213927  char space[8], eol[16];
     
    39383944
    39393945  if (nFrags > 0) {
    3940     multiLine = gFalse;
    39413946    for (i = 0; i < nFrags; ++i) {
    39423947      frag = &frags[i];
     
    53475352}
    53485353
    5349 void TextOutputDev::processLink(Link *link, Catalog * /*catalog*/) {
     5354void TextOutputDev::processLink(AnnotLink *link, Catalog * /*catalog*/) {
    53505355  double x1, y1, x2, y2;
    53515356  int xMin, yMin, xMax, yMax, x, y;
Note: See TracChangeset for help on using the changeset viewer.