[freetype2-demos] master b57ae71: * src/ftcommon.c (FTDemo_String_Draw): Avoid endless loop.

[Alexei Podtelezhnikov]

branch: master
commit b57ae71d1cb7e06f9878e72c84f4bef71bf48a71
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * src/ftcommon.c (FTDemo_String_Draw): Avoid endless loop.
    * src/ftstring.c (main): Don't disable sbits.
---
 ChangeLog      | 5 +++++
 src/ftcommon.c | 2 +-
 src/ftstring.c | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 600498c..56974be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-06  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftcommon.c (FTDemo_String_Draw): Avoid endless loop.
+       * src/ftstring.c (main): Don't disable sbits.
+
 2018-10-04  Alexei Podtelezhnikov  <address@hidden>
 
        * src/ftstring.c (Render_Waterfall): Color the size marks.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index b803d70..c07ad9b 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -1448,7 +1448,7 @@
 
     /* calculate the extent */
     if ( sc->extent )
-      for( n = first; ; n++ )
+      for( n = first; n < first + last || pen.x > 0; n++ )  /* chk progress */
       {
         m = n % handle->string_length;  /* recycling */
         if ( pen.x + handle->string[m].hadvance.x > sc->extent )
diff --git a/src/ftstring.c b/src/ftstring.c
index 0fe9083..c940269 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -877,7 +877,6 @@
     FT_Library_SetLcdFilter( handle->library, FT_LCD_FILTER_LIGHT );
 
     handle->encoding  = status.encoding;
-    handle->use_sbits = 0;
 
     for ( ; argc > 0; argc--, argv++ )
     {