sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes a problem with one of the font files. From Pierre-noel Bouteville

Browse Source
This commit is contained in:
Gregory Nutt 2015-02-03 13:30:14 -06:00
parent 8ced2c2fda
commit 86c5777314
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnx/nxfonts/nxfonts_getfont.c
View File

@ -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

10
libnx/nxfonts/nxfonts_sans39x48.h
View File

@ -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 */