diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-09 20:41:08 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-09 20:41:08 +0000 |
| commit | 5956e64bad49ffd72892ecc34ccfbbc8779a8871 (patch) | |
| tree | 9144f187b20b77221c15acf6cf2bfcc7c6eead49 | |
| parent | f1dba849965d4b5f35fa963ed0efe0a4b0bcb2e9 (diff) | |
| download | px4-nuttx-5956e64bad49ffd72892ecc34ccfbbc8779a8871.tar.gz px4-nuttx-5956e64bad49ffd72892ecc34ccfbbc8779a8871.tar.bz2 px4-nuttx-5956e64bad49ffd72892ecc34ccfbbc8779a8871.zip | |
Fix a critical font rendering bug
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3762 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | apps/examples/nxtext/nxtext_putc.c | 2 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/nxtext/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/graphics/nxfonts/nxfonts_convert.c | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index 90170e113..6745b3c87 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -100,7 +100,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: nxtext_renderglyph + * Name: nxtext_freeglyph ****************************************************************************/ static void nxtext_freeglyph(FAR struct nxtext_glyph_s *glyph) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 3b0f4905c..a552284f1 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1887,3 +1887,6 @@ by Hal Glenn. * arch/arm/src/lpc17xx: Changes to compile successfully with no serial console (also submitted by Hal Glenn). + * graphics/nxfonts/nxfonts_convert.c: Fixed a critical bug that caused + when renderer some fonts with bits-per-pixel > 8 + diff --git a/nuttx/configs/stm3210e-eval/nxtext/Make.defs b/nuttx/configs/stm3210e-eval/nxtext/Make.defs index a144f16ab..110edb2d7 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/Make.defs +++ b/nuttx/configs/stm3210e-eval/nxtext/Make.defs @@ -48,24 +48,27 @@ ifeq ($(CONFIG_STM32_CODESOURCERYW),y) CROSSDEV = arm-none-eabi- WINTOOL = y ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft + MAXOPTIMIZATION = -O1 endif ifeq ($(CONFIG_STM32_CODESOURCERYL),y) # CodeSourcery under Linux CROSSDEV = arm-none-eabi- ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft - MAXOPTIMIZATION = -O2 + MAXOPTIMIZATION = -O1 endif ifeq ($(CONFIG_STM32_DEVKITARM),y) # devkitARM under Windows CROSSDEV = arm-eabi- WINTOOL = y ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft + MAXOPTIMIZATION = -O2 endif ifeq ($(CONFIG_STM32_RAISONANCE),y) # Raisonance RIDE7 under Windows CROSSDEV = arm-none-eabi- WINTOOL = y ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft + MAXOPTIMIZATION = -O2 endif ifeq ($(CONFIG_STM32_BUILDROOT),y) # NuttX buildroot under Linux or Cygwin @@ -82,7 +85,6 @@ ifeq ($(WINTOOL),y) ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nxtext/$(LDSCRIPT)}" - MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/graphics/nxfonts/nxfonts_convert.c index 429518cf0..b7b99e78a 100644 --- a/nuttx/graphics/nxfonts/nxfonts_convert.c +++ b/nuttx/graphics/nxfonts/nxfonts_convert.c @@ -279,8 +279,11 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) dptr++; } } - line += stride; } + + /* Advance to the beginning of the next line in the destination */ + + line += stride; } #endif return OK; |