diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 10:52:11 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 10:52:11 +0000 |
commit | 29e5a1acca69bf617ebaa3b4f98db113fe22471e (patch) | |
tree | 8b8e2b11952072f1a10f5a72fe5f6d602276b12f /psprint | |
parent | 4c3251d992325a7f5d18ad5aac7902e05b4e1470 (diff) |
INTEGRATION: CWS ooo20031216 (1.4.62); FILE MERGED
2003/12/25 12:57:14 waratah 1.4.62.2: #i1858# correct for some uninitialised variables
2003/12/13 14:10:21 waratah 1.4.62.1: #i1858# test for previous definition of macro to remove warning
Diffstat (limited to 'psprint')
-rw-r--r-- | psprint/source/fontsubset/ttcr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/psprint/source/fontsubset/ttcr.c b/psprint/source/fontsubset/ttcr.c index 8a0a0de4886f..5f1ca04705f8 100644 --- a/psprint/source/fontsubset/ttcr.c +++ b/psprint/source/fontsubset/ttcr.c @@ -2,9 +2,9 @@ * * $RCSfile: ttcr.c,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:14:27 $ + * last change: $Author: hr $ $Date: 2004-02-04 11:52:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,7 @@ * ************************************************************************/ -/* $Id: ttcr.c,v 1.4 2003-04-15 16:14:27 vg Exp $ */ +/* $Id: ttcr.c,v 1.5 2004-02-04 11:52:11 hr Exp $ */ /* * TrueTypeCreator method implementation @@ -73,7 +73,9 @@ #include <string.h> #if OSL_DEBUG_LEVEL == 0 -#define NDEBUG +# ifndef NDEBUG +# define NDEBUG +# endif #endif #include <assert.h> @@ -348,7 +350,7 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length) sal_uInt8 *ttf; int i=0, n; TableEntry *te; - sal_uInt8 *head; /* saved pointer to the head table data for checkSumAdjustment calculation */ + sal_uInt8 *head = NULL; /* saved pointer to the head table data for checkSumAdjustment calculation */ if ((n = listCount(_this->tables)) == 0) return SF_TTFORMAT; |