Fix a critical font rendering bug
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3762 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
parent
85ccde87b4
commit
d33cb66ef5
|
@ -100,7 +100,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: nxtext_renderglyph
|
||||
* Name: nxtext_freeglyph
|
||||
****************************************************************************/
|
||||
|
||||
static void nxtext_freeglyph(FAR struct nxtext_glyph_s *glyph)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue