Changeset da15002 in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2021-05-10T18:41:29Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

344f8b9, d091007

Parents:

8dbd13d

Message:

No need to load font twice

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (3 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -605 +605 @@
         gfx_color_t *color = NULL;
         gfx_rect_t rect;
-        gfx_typeface_t *tface = NULL;
-        gfx_font_info_t *finfo;
-        gfx_font_t *font = NULL;
         gfx_coord2_t pos;
         gfx_text_fmt_t fmt;
@@ -615 +612 @@
         if (quit)
                 return EOK;
-
-        /* XXX Crude way of detecting text mode */
-        if (w < 256) {
-                /* Create dummy font for text mode */
-                rc = gfx_typeface_create(gc, &tface);
-                if (rc != EOK) {
-                        printf("Error creating typeface\n");
-                        goto error;
-                }
-
-                rc = gfx_font_create_textmode(tface, &font);
-                if (rc != EOK) {
-                        printf("Error creating font\n");
-                        goto error;
-                }
-        } else {
-                /* Load font */
-                rc = gfx_typeface_open(gc, "/data/font/helena.tpf", &tface);
-                if (rc != EOK) {
-                        printf("Error opening typeface\n");
-                        goto error;
-                }
-
-                finfo = gfx_typeface_first_font(tface);
-                if (finfo == NULL) {
-                        printf("Typeface contains no font.\n");
-                        rc = ENOENT;
-                        goto error;
-                }
-
-                rc = gfx_font_open(finfo, &font);
-                if (rc != EOK) {
-                        printf("Error opening font.\n");
-                        goto error;
-                }
-        }
 
         rc = demo_begin(gc, w, h, "Text rendering");
@@ -801 +762 @@
         }
 
-        gfx_font_close(font);
-        gfx_typeface_destroy(tface);
         return EOK;
 error:
-        if (font != NULL)
-                gfx_font_close(font);
-        if (tface != NULL)
-                gfx_typeface_destroy(tface);
         return rc;
 }