← Back to branch summary

~ubuntu-branches/ubuntu/precise/poppler/precise-security

« back to all changes in this revision

Viewing changes to poppler/CairoFontEngine.cc

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-03-08 10:46:40 UTC
  • mfrom: (1.5.5) (4.3.2 experimental)
  • Revision ID: package-import@ubuntu.com-20110308104640-de1rwygu2cx2t0yt
Tags: 0.16.3-1ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
  - debian/control: Lower poppler-data to Suggests: (handled by
    language-selector).
  - Add 10_fix-a4-page-shift-on-brother-ps-printers.patch: Fix page shifts
    when printing on A4 paper with Brother PostScript printers.
    (LP #293832)
  - debian/control, debian/rules: Disable OpenJPEG, it's in universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
poppler/CairoFontEngine.cc
18
18
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
19
19
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
20
20
// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
21
 
// Copyright (C) 2006, 2007, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 
21
// Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
22
22
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
23
23
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
24
24
// Copyright (C) 2008 Adrian Johnson <ajohnson@redneon.com>
467
467
      }
468
468
    }
469
469
    break;
470
 
    
471
470
  case fontCIDType2:
 
471
  case fontCIDType2OT:
472
472
    codeToGID = NULL;
473
473
    n = 0;
474
474
    if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {