OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a critical font rendering bug 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3762 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-07-09 20:41:08 +00:00
parent 64fe463b9d
commit ed975abb65
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1887,3 +1887,6 @@
by Hal Glenn. by Hal Glenn.
* arch/arm/src/lpc17xx: Changes to compile successfully with no serial console * arch/arm/src/lpc17xx: Changes to compile successfully with no serial console
(also submitted by Hal Glenn). (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

6
configs/stm3210e-eval/nxtext/Make.defs
View File

@ -48,24 +48,27 @@ ifeq ($(CONFIG_STM32_CODESOURCERYW),y)
CROSSDEV = arm-none-eabi- CROSSDEV = arm-none-eabi-
WINTOOL = y WINTOOL = y
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
MAXOPTIMIZATION = -O1
endif endif
ifeq ($(CONFIG_STM32_CODESOURCERYL),y) ifeq ($(CONFIG_STM32_CODESOURCERYL),y)
# CodeSourcery under Linux # CodeSourcery under Linux
CROSSDEV = arm-none-eabi- CROSSDEV = arm-none-eabi-
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
MAXOPTIMIZATION = -O2 MAXOPTIMIZATION = -O1
endif endif
ifeq ($(CONFIG_STM32_DEVKITARM),y) ifeq ($(CONFIG_STM32_DEVKITARM),y)
# devkitARM under Windows # devkitARM under Windows
CROSSDEV = arm-eabi- CROSSDEV = arm-eabi-
WINTOOL = y WINTOOL = y
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
MAXOPTIMIZATION = -O2
endif endif
ifeq ($(CONFIG_STM32_RAISONANCE),y) ifeq ($(CONFIG_STM32_RAISONANCE),y)
# Raisonance RIDE7 under Windows # Raisonance RIDE7 under Windows
CROSSDEV = arm-none-eabi- CROSSDEV = arm-none-eabi-
WINTOOL = y WINTOOL = y
ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
MAXOPTIMIZATION = -O2
endif endif
ifeq ($(CONFIG_STM32_BUILDROOT),y) ifeq ($(CONFIG_STM32_BUILDROOT),y)
# NuttX buildroot under Linux or Cygwin # NuttX buildroot under Linux or Cygwin
@ -82,7 +85,6 @@ ifeq ($(WINTOOL),y)
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" 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)}" ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nxtext/$(LDSCRIPT)}"
MAXOPTIMIZATION = -O2
else else
# Linux/Cygwin-native toolchain # Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps.sh MKDEP = $(TOPDIR)/tools/mkdeps.sh

5
graphics/nxfonts/nxfonts_convert.c
View File

@ -279,8 +279,11 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX)
dptr++; dptr++;
} }
} }
line += stride;
} }
/* Advance to the beginning of the next line in the destination */
line += stride;
} }
#endif #endif
return OK; return OK;