diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-07 14:39:03 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-07 14:39:03 -0400 |
| commit | 3fd7a510b5467479d6e2559819b96b222c7328e8 (patch) | |
| tree | e19cc57b1717c652a91a8e22fcc6e1ee6d62d679 | |
| parent | 440166a027b78eb53d7686937148b755ad51f7f9 (diff) | |
One more missed static in Type1
| -rw-r--r-- | src/Type1/t1funcs.c | 50 | ||||
| -rw-r--r-- | src/Type1/t1intf.h | 1 |
2 files changed, 25 insertions, 26 deletions
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c index 1f78b94..e4b2209 100644 --- a/src/Type1/t1funcs.c +++ b/src/Type1/t1funcs.c @@ -150,6 +150,31 @@ extern psobj *ISOLatin1EncArrayP; static void fill ( char *dest, int h, int w, struct region *area, int byte, int bit, int wordsize ); +static int +Type1ReturnCodeToXReturnCode(int rc) +{ + switch(rc) { + case SCAN_OK: + return Successful; + case SCAN_FILE_EOF: + /* fall through to BadFontFormat */ + case SCAN_ERROR: + return BadFontFormat; + case SCAN_OUT_OF_MEMORY: + return AllocError; + case SCAN_FILE_OPEN_ERROR: + return BadFontName; + case SCAN_TRUE: + case SCAN_FALSE: + case SCAN_END: + /* fall through */ + default: + /* this should not happen */ + ErrorF("Type1 return code not convertable to X return code: %d\n", rc); + return rc; + } +} + /*ARGSUSED*/ int Type1OpenScalable (FontPathElementPtr fpe, @@ -727,28 +752,3 @@ Type1RegisterFontFileFunctions(void) for (i=0; i < sizeof(renderers) / sizeof(FontRendererRec); i++) FontFilePriorityRegisterRenderer(&renderers[i], -10); } - -int -Type1ReturnCodeToXReturnCode(int rc) -{ - switch(rc) { - case SCAN_OK: - return Successful; - case SCAN_FILE_EOF: - /* fall through to BadFontFormat */ - case SCAN_ERROR: - return BadFontFormat; - case SCAN_OUT_OF_MEMORY: - return AllocError; - case SCAN_FILE_OPEN_ERROR: - return BadFontName; - case SCAN_TRUE: - case SCAN_FALSE: - case SCAN_END: - /* fall through */ - default: - /* this should not happen */ - ErrorF("Type1 return code not convertable to X return code: %d\n", rc); - return rc; - } -} diff --git a/src/Type1/t1intf.h b/src/Type1/t1intf.h index d1ac727..3719080 100644 --- a/src/Type1/t1intf.h +++ b/src/Type1/t1intf.h @@ -44,7 +44,6 @@ extern int Type1OpenScalable ( FontPathElementPtr fpe, FontPtr *ppFont, fsBitmapFormatMask fmask, FontPtr non_cachable_font ); extern void Type1CloseFont ( FontPtr pFont ); -extern int Type1ReturnCodeToXReturnCode ( int rc ); /* t1info.c */ extern int Type1GetInfoScalable ( FontPathElementPtr fpe, FontInfoPtr pInfo, |