~matttbe/ubuntu/raring/poppler/lp1072129

« back to all changes in this revision

Viewing changes to poppler/Annot.cc

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2011-04-05 16:23:40 UTC
  • mfrom: (1.5.7) (4.4.5 sid)
  • Revision ID: package-import@ubuntu.com-20110405162340-le5fy9fxqmxmvd6a
Tags: 0.16.7-2ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
* debian/control: 
  - Lower poppler-data to Suggests: (handled by language-selector).
* debian/control, 
  debian/rules: 
  - disable OpenJPEG, it's in universe.
* debian/patches/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/patches/11_set-font-weight-medium.patch: added
  - set FC_WEIGHT_MEDIUM when the font name contains "Medium", LP: #769827

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
24
24
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
25
25
// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 
26
// Copyright (C) 2011 José Aliste <jaliste@src.gnome.org>
26
27
//
27
28
// To see a description of the changes please see the Changelog file that
28
29
// came with your tarball or type make ChangeLog if you are building from git
4247
4248
      ok = gFalse;
4248
4249
    }
4249
4250
  }
 
4251
  obj1.free();
4250
4252
 
4251
4253
  dict->lookup("AA", &additionAction);
4252
4254