[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 6019fde: [ftstring, ftview] Small clean-ups,
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master 6019fde: [ftstring, ftview] Small clean-ups, |
Date: |
Thu, 26 Nov 2015 03:11:02 +0000 |
branch: master
commit 6019fde44e92967df1e98f1b6284c849f2cce7d4
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
[ftstring, ftview] Small clean-ups,
* src/ftstring.c (event_lcdmode_change): Robustify the switch.
* src/ftview.c (write_header): Ditto.
---
ChangeLog | 7 +++++++
src/ftstring.c | 10 ++++------
src/ftview.c | 8 ++++----
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e2926d7..cda0465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-25 Alexei Podtelezhnikov <address@hidden>
+
+ [ftstring, ftview] Small clean-ups,
+
+ * src/ftstring.c (event_lcdmode_change): Robustify the switch.
+ * src/ftview.c (write_header): Ditto.
+
2015-11-25 Werner Lemberg <address@hidden>
* src/ftstring.c: Fix compilation warnings.
diff --git a/src/ftstring.c b/src/ftstring.c
index bb0c780..2d321e6 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -196,18 +196,13 @@
static void
event_lcdmode_change( void )
{
- const char *lcd_mode = NULL;
+ const char *lcd_mode;
handle->lcd_mode++;
switch ( handle->lcd_mode )
{
- case N_LCD_MODES:
- handle->lcd_mode = 0;
- case LCD_MODE_AA:
- lcd_mode = " normal AA";
- break;
case LCD_MODE_LIGHT:
lcd_mode = " light AA";
break;
@@ -223,6 +218,9 @@
case LCD_MODE_VBGR:
lcd_mode = " LCD (vert. BGR)";
break;
+ default:
+ handle->lcd_mode = 0;
+ lcd_mode = " normal AA";
}
sprintf( status.header_buffer, "mode changed to %s", lcd_mode );
diff --git a/src/ftview.c b/src/ftview.c
index 46ad14c..2cec548 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1670,14 +1670,11 @@
if ( handle->antialias )
{
- const char* lcd_mode = NULL;
+ const char* lcd_mode;
switch ( handle->lcd_mode )
{
- case LCD_MODE_AA:
- lcd_mode = " normal AA";
- break;
case LCD_MODE_LIGHT:
lcd_mode = " light AA";
break;
@@ -1693,6 +1690,9 @@
case LCD_MODE_VBGR:
lcd_mode = " LCD (vert. BGR)";
break;
+ default:
+ handle->lcd_mode = 0;
+ lcd_mode = " normal AA";
}
grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
lcd_mode, display->fore_color );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 6019fde: [ftstring, ftview] Small clean-ups,,
Alexei Podtelezhnikov <=