[freetype2-demos] master 4e999e7 1/2: * src/ftgrid.c (gitd_status_init): Set default resolution here...

[Alexei Podtelezhnikov]

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

    * src/ftgrid.c (gitd_status_init): Set default resolution here...
    (parse_cmdline): ... instead of here.
---
 ChangeLog    | 5 +++++
 src/ftgrid.c | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e5a3e4..908133c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-25  Alexei Podtelezhnikov  <address@hidden>
+
+       * src/ftgrid.c (gitd_status_init): Set default resolution here...
+       (parse_cmdline): ... instead of here.
+
 2018-04-23  Alexei Podtelezhnikov  <address@hidden>
 
        * src/ftcommon.c (FTDemo_Draw_Header): Hide redundant point size.
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 212cd83..4618f45 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -165,6 +165,7 @@
   {
     st->width         = DIM_X;
     st->height        = DIM_Y;
+    st->res           = 72;
 
     st->scale         = 64;
     st->x_origin      = 0;
@@ -1977,9 +1978,6 @@
     if ( status.ptsize == 0 )
       status.ptsize = 64 * 10;
 
-    if ( status.res <= 0 )
-      status.res = 72;
-
     (*argc)--;
     (*argv)++;
   }