parent
b023dbd384
commit
f2fb985c7a
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2006-02-21 Paul Cornett <paulcor1@bullseye.com>
|
||||||
|
reviewed by: plam
|
||||||
|
|
||||||
|
* src/fccache.c (FcDirCacheWrite):
|
||||||
|
* src/fcdir.c (FcFileScanConfig):
|
||||||
|
* src/fcfreetype.c (FcStringInPatternElement):
|
||||||
|
* src/fcxml.c (FcParseFamilies):
|
||||||
|
* src/ftglue.c (ftglue_face_goto_table):
|
||||||
|
|
||||||
|
Eliminate redundancies.
|
||||||
|
|
||||||
2006-02-21 Kjartan Maraas <kmaraas@gnome.org>
|
2006-02-21 Kjartan Maraas <kmaraas@gnome.org>
|
||||||
reviewed by: plam
|
reviewed by: plam
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#define ENDIAN_TEST 0x12345678
|
#define ENDIAN_TEST 0x12345678
|
||||||
#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1
|
#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
|
||||||
|
|
||||||
#ifndef O_BINARY
|
#ifndef O_BINARY
|
||||||
#define O_BINARY 0
|
#define O_BINARY 0
|
||||||
|
@ -1371,6 +1371,7 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
|
||||||
metadata.count)
|
metadata.count)
|
||||||
perror("write current_dir_block");
|
perror("write current_dir_block");
|
||||||
free (current_dir_block);
|
free (current_dir_block);
|
||||||
|
current_dir_block = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* this actually serves to pad out the cache file, if needed */
|
/* this actually serves to pad out the cache file, if needed */
|
||||||
|
|
|
@ -55,9 +55,6 @@ FcFileScanConfig (FcFontSet *set,
|
||||||
if (FcFileIsDir (file))
|
if (FcFileIsDir (file))
|
||||||
return FcStrSetAdd (dirs, file);
|
return FcStrSetAdd (dirs, file);
|
||||||
|
|
||||||
if (force)
|
|
||||||
cache = 0;
|
|
||||||
|
|
||||||
id = 0;
|
id = 0;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
|
|
@ -976,7 +976,6 @@ FcStringInPatternElement (FcPattern *pat, const char *elt, FcChar8 *string)
|
||||||
if (!FcStrCmpIgnoreBlanksAndCase (old, string))
|
if (!FcStrCmpIgnoreBlanksAndCase (old, string))
|
||||||
{
|
{
|
||||||
return FcTrue;
|
return FcTrue;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return FcFalse;
|
return FcFalse;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1320,8 +1320,7 @@ FcParseFamilies (FcConfigParse *parse, FcVStackTag tag)
|
||||||
if (!FcVStackPushExpr (parse, tag, expr))
|
if (!FcVStackPushExpr (parse, tag, expr))
|
||||||
{
|
{
|
||||||
FcConfigMessage (parse, FcSevereError, "out of memory");
|
FcConfigMessage (parse, FcSevereError, "out of memory");
|
||||||
if (expr)
|
FcExprDestroy (expr);
|
||||||
FcExprDestroy (expr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -290,7 +290,6 @@ ftglue_face_goto_table( FT_Face face,
|
||||||
if ( face->num_faces > 1 )
|
if ( face->num_faces > 1 )
|
||||||
{
|
{
|
||||||
/* deal with TrueType collections */
|
/* deal with TrueType collections */
|
||||||
FT_ULong offset;
|
|
||||||
|
|
||||||
LOG(( ">> This is a TrueType Collection\n" ));
|
LOG(( ">> This is a TrueType Collection\n" ));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue