diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-03 13:30:14 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-03 13:30:14 -0600 |
| commit | d83138ac5ad741a8f804d5daa1d78b72c368fee9 (patch) | |
| tree | b432a93a7dff38bc7e58156e9aafd94ddcc8d85e /nuttx/libnx/nxfonts | |
| parent | c032f572233bf175034cbb116e0898dd10f2ad8c (diff) | |
| download | px4-nuttx-d83138ac5ad741a8f804d5daa1d78b72c368fee9.tar.gz px4-nuttx-d83138ac5ad741a8f804d5daa1d78b72c368fee9.tar.bz2 px4-nuttx-d83138ac5ad741a8f804d5daa1d78b72c368fee9.zip | |
Fixes a problem with one of the font files. From Pierre-noel Bouteville
Diffstat (limited to 'nuttx/libnx/nxfonts')
| -rw-r--r-- | nuttx/libnx/nxfonts/nxfonts_getfont.c | 6 | ||||
| -rw-r--r-- | nuttx/libnx/nxfonts/nxfonts_sans39x48.h | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/nuttx/libnx/nxfonts/nxfonts_getfont.c b/nuttx/libnx/nxfonts/nxfonts_getfont.c index 2d87ab8dd..fe443138d 100644 --- a/nuttx/libnx/nxfonts/nxfonts_getfont.c +++ b/nuttx/libnx/nxfonts/nxfonts_getfont.c @@ -138,7 +138,11 @@ extern const struct nx_fontpackage_s g_serif22x28b_package; extern const struct nx_fontpackage_s g_serif27x38b_package; #endif -#ifdef CONFIG_NXFONT_SERIF38X49 +#ifdef CONFIG_NXFONT_SERIF38X48 +extern const struct nx_fontpackage_s g_serif38x48_package; +#endif + +#ifdef CONFIG_NXFONT_SERIF38X49B extern const struct nx_fontpackage_s g_serif38x49b_package; #endif diff --git a/nuttx/libnx/nxfonts/nxfonts_sans39x48.h b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h index df465f3a4..85459a64b 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans39x48.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h @@ -1,5 +1,5 @@ /**************************************************************************** - * libnx/nxfonts/nxfonts_serif39x48.h + * libnx/nxfonts/nxfonts_sans39x48.h * * Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved. * Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com> @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H +#ifndef __LIBNX_NXFONTS_NXFONTS_SANS39X48_H +#define __LIBNX_NXFONTS_NXFONTS_SANS39X48_H /**************************************************************************** * Included Files @@ -46,7 +46,7 @@ /* Font ID */ -#define NXFONT_ID FONTID_SERIF39X48 +#define NXFONT_ID FONTID_SANS39X48 /* Ranges of 7-bit and 8-bit fonts */ @@ -846,4 +846,4 @@ extern "C" { } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H */ +#endif /* __LIBNX_NXFONTS_NXFONTS_SANS39X48_H */ |