* src/cff/cffdrivr.c (cff_get_cmap_info): Initialize `format' field.


			
			
				david-pic-changes
			
			
		
Werner Lemberg 16 years ago
parent e7aad0254c
commit 312043f41b
  1. 5
      ChangeLog
  2. 9
      include/freetype/internal/services/svttcmap.h
  3. 1
      src/cff/cffdrivr.c

@ -1,3 +1,8 @@
2008-11-12 Tor Andersson <tor.andersson@gmail.com>
* src/cff/cffdrivr.c (cff_get_cmap_info): Initialize `format' field.
This fixes Savannah bug #24819.
2008-11-08 Werner Lemberg <wl@gnu.org>
* src/sfnt/sfobjs.c (sfnt_load_face): Remove #if 0/#endif guards

@ -7,7 +7,7 @@
/* Copyright 2003 by */
/* Masatake YAMATO, Redhat K.K. */
/* */
/* Copyright 2003 by */
/* Copyright 2003, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -49,6 +49,13 @@ FT_BEGIN_HEADER
/* The language ID used in Mac fonts. Definitions of values are in */
/* freetype/ttnameid.h. */
/* */
/* format :: */
/* The cmap format. OpenType 1.5 defines the formats 0 (byte */
/* encoding table), 2~(high-byte mapping through table), 4~(segment */
/* mapping to delta values), 6~(trimmed table mapping), 8~(mixed */
/* 16-bit and 32-bit coverage), 10~(trimmed array), 12~(segmented */
/* coverage), and 14 (Unicode Variation Sequences). */
/* */
typedef struct TT_CMapInfo_
{
FT_ULong language;

@ -426,6 +426,7 @@
cmap_info->language = 0;
cmap_info->format = 0;
if ( cmap->clazz != &cff_cmap_encoding_class_rec &&
cmap->clazz != &cff_cmap_unicode_class_rec )

Loading…
Cancel
Save