diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-04-20 15:38:44 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-04-20 15:38:44 +0000 |
| commit | f18e7d922246224a361263f4eb2ef92d5e9c9f06 (patch) | |
| tree | f961e944eb9a50cdacb203dbdb69d8fab325e171 | |
| parent | d6d8d586b4e9c8ba5ce8585c9886028ce5874e59 (diff) | |
| download | netpbm-mirror-f18e7d922246224a361263f4eb2ef92d5e9c9f06.tar.gz netpbm-mirror-f18e7d922246224a361263f4eb2ef92d5e9c9f06.tar.xz netpbm-mirror-f18e7d922246224a361263f4eb2ef92d5e9c9f06.zip | |
Fix some corruption from merge 3 days ago
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2712 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | lib/libpbmfont.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libpbmfont.c b/lib/libpbmfont.c index 55d3be0c..5193cd35 100644 --- a/lib/libpbmfont.c +++ b/lib/libpbmfont.c @@ -12,6 +12,13 @@ ** copyright notice and this permission notice appear in supporting ** documentation. This software is provided "as is" without express or ** implied warranty. +** +** BDF font specs available from: +** https://partners.adobe.com/public/developer/en/font/5005.BDF_Spec.pdf +** Glyph Bitmap Distribution Format (BDF) Specification +** Version 2.2 +** 22 March 1993 +** Adobe Developer Support */ #include <assert.h> @@ -776,8 +783,6 @@ validateGlyphLimits(const struct font * const fontP, glyphP->height == 0 || glyphP->width > fontP->maxwidth || glyphP->height > fontP->maxheight || - glyphP->width > fontP->maxwidth || - glyphP->height > fontP->maxheight || glyphP->x < fontP->x || glyphP->y < fontP->y || glyphP->x + (int) glyphP->width > fontP->x + fontP->maxwidth || |