← Back to branch summary

~clint-fewbar/ubuntu/natty/php5/merge-5.3.3-3

« back to all changes in this revision

Viewing changes to ext/gd/gd.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-01-26 14:09:58 UTC
  • mfrom: (1.1.16 upstream) (0.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
https://launchpad.net/bugs/323731
* Merge from debian testing.  Remaining changes:
  - debian/control, debian/rules: Disable a few build dependencies and
    accompanying binary packages which we do not want to support in main:
    + firebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client/php5-imap (we have a seperate php-imap source)
    + libmcrypt-dev/php5-mcrypt (seperate php-mcrypt source)
    + readline support again, now that the libedit issue is fixed.
  - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1)
    CLI readline support.
  - debian/rules:
    + Correctly mangle PHP5_* macros for lpia
  - debian/control:
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
  - debian/control: Move php5-suhoshin to Suggests.
  - debian/rules: Fix broken symlink for pear.
  - main/php_version.h: updated with Ubuntu version info
  - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch
  - debian/rules, debian/source_php5.py: Install apport hook. 
* Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/gd/gd.c
18
18
   +----------------------------------------------------------------------+
19
19
 */
20
20
 
21
 
/* $Id: gd.c 282456 2009-06-19 22:15:44Z kalle $ */
 
21
/* $Id: gd.c 292109 2009-12-14 04:09:18Z pierrick $ */
22
22
 
23
23
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
24
24
   Cold Spring Harbor Labs. */
4503
4503
        T1_DeleteAllSizes(*f_ind);
4504
4504
        if (T1_ReencodeFont(*f_ind, enc_vector)) {
4505
4505
                T1_DeleteEncoding(enc_vector);
4506
 
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't reencode font");
 
4506
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-encode font");
4507
4507
                RETURN_FALSE;
4508
4508
        }
4509
4509