[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 8e5007f: * src/ftstring.c (main): Update initia
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master 8e5007f: * src/ftstring.c (main): Update initializations. |
Date: |
Thu, 26 Apr 2018 22:40:06 -0400 (EDT) |
branch: master
commit 8e5007f6e3d27cdbfd3d85d55dd1035b2df74aa6
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
* src/ftstring.c (main): Update initializations.
---
ChangeLog | 4 ++++
src/ftstring.c | 11 ++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a7dc9b5..6b3712b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-26 Alexei Podtelezhnikov <address@hidden>
+
+ * src/ftstring.c (main): Update initializations.
+
2018-04-25 Alexei Podtelezhnikov <address@hidden>
* src/ftstring.c (main): Use size metrics instead of resolution.
diff --git a/src/ftstring.c b/src/ftstring.c
index 0d3814d..eab262a 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -100,7 +100,7 @@
} status = { DIM_X, DIM_Y,
RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, 0, NULL,
- { 0, 0, 0, 0, NULL },
+ { 0, 0, 0x8000, 0, NULL },
{ 0 }, { 0, 0, 0, 0 }, 0, NULL, { 0 } };
static FTDemo_Display* display;
@@ -720,7 +720,6 @@
switch ( status.render_mode )
{
case RENDER_MODE_STRING:
- status.sc.center = 1L << 15;
error = FTDemo_String_Draw( handle, display,
&status.sc,
display->bitmap->width / 2,
@@ -730,7 +729,7 @@
case RENDER_MODE_KERNCMP:
{
FT_Size size;
- FTDemo_String_Context sc = status.sc;
+ FTDemo_String_Context sc = { 0, 0, 0, 0, NULL };
FT_Int x, y;
FT_Int height;
@@ -743,12 +742,6 @@
height = CELLSTRING_HEIGHT;
/* First line: none */
- sc.center = 0;
- sc.kerning_mode = 0;
- sc.kerning_degree = 0;
- sc.vertical = 0;
- sc.matrix = NULL;
-
y = CELLSTRING_HEIGHT * 2 + display->bitmap->rows / 4 + height;
grWriteCellString( display->bitmap, 5,
y - ( height + CELLSTRING_HEIGHT ) / 2,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 8e5007f: * src/ftstring.c (main): Update initializations.,
Alexei Podtelezhnikov <=