← Back to branch summary

~ubuntu-branches/ubuntu/raring/libxfont/raring-security

« back to all changes in this revision

Viewing changes to src/bitmap/bitmap.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois, Cyril Brulebois, Julien Cristau
  • Date: 2012-03-04 09:24:59 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120304092459-cbu7e0ujz24lslpt
Tags: 1:1.4.5-1
http://bugs.debian.org/654154
[ Cyril Brulebois ]
* New upstream release.
* Switch to dh:
  - Bump debhelper build-dep and compat.
  - Rewrite debian/rules, using autoreconf and quilt sequences.
  - Adjust build dependencies accordingly.
  - Use build-main and build-udeb as build directories.
  - Adjust .install accordingly.
* Remove xsfbs accordingly.
* Add support for hardened build flags through dpkg-buildflags, based
  on a patch by Moritz Muehlenhoff, thanks! (Closes: #654154).

[ Julien Cristau ]
* Remove David Nusinow from Uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bitmap/bitmap.c
36
36
#include <X11/fonts/bitmap.h>
37
37
 
38
38
int
39
 
bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars, 
40
 
                FontEncoding charEncoding, 
 
39
bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars,
 
40
                FontEncoding charEncoding,
41
41
                unsigned long *glyphCount,      /* RETURN */
42
42
                CharInfoPtr *glyphs)            /* RETURN */
43
43
{
126
126
static CharInfoRec nonExistantChar;
127
127
 
128
128
int
129
 
bitmapGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars, 
130
 
                 FontEncoding charEncoding, 
 
129
bitmapGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars,
 
130
                 FontEncoding charEncoding,
131
131
                 unsigned long *glyphCount,     /* RETURN */
132
132
                 xCharInfo **glyphs)            /* RETURN */
133
133
{