Changeset 0576df9 in mainline for uspace/app/launcher

Timestamp:

2020-11-14T21:28:35Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

63b35c7

Parents:

38f5598

Message:

Decoding images without libdraw

Location:

uspace/app/launcher

Files:

• launcher.c (modified) (6 diffs)
• meson.build (modified) (1 diff)

uspace/app/launcher/launcher.c

@@ -36 +36 @@
 #include <errno.h>
 #include <gfx/coord.h>
+#include <gfximage/tga.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -42 +43 @@
 #include <str_error.h>
 #include <task.h>
-
-#include <draw/surface.h>
-#include <draw/source.h>
-#include <draw/drawctx.h>
-#include <draw/codec.h>
-
 #include <ui/fixed.h>
 #include <ui/image.h>
@@ -157 +152 @@
         gfx_bitmap_params_t logo_params;
         gfx_bitmap_t *logo_bmp;
-        gfx_bitmap_alloc_t alloc;
         gfx_context_t *gc;
-        surface_coord_t w, h;
         gfx_rect_t logo_rect;
         gfx_rect_t rect;
+        gfx_coord2_t off;
         errno_t rc;
 
@@ -182 +176 @@
         }
 
-        surface_t *logo = decode_tga((void *) helenos_tga, helenos_tga_size,
-            SURFACE_FLAG_SHARED);
-        if (!logo) {
-                printf("Unable to decode logo.\n");
-                return 1;
-        }
-
         rc = ui_create(display_spec, &ui);
         if (rc != EOK) {
@@ -217 +204 @@
         gc = ui_window_get_gc(window);
 
-        surface_get_resolution(logo, &w, &h);
+        rc = decode_tga(gc, (void *) helenos_tga, helenos_tga_size,
+            &logo_bmp, &logo_rect);
+        if (rc != EOK) {
+                printf("Unable to decode logo.\n");
+                return 1;
+        }
+
         gfx_bitmap_params_init(&logo_params);
-        logo_params.rect.p1.x = w;
-        logo_params.rect.p1.y = h;
-        logo_rect = logo_params.rect;
-
-        alloc.pitch = sizeof(uint32_t) * w;
-        alloc.off0 = 0;
-        alloc.pixels = surface_direct_access(logo);
-
-        rc = gfx_bitmap_create(gc, &logo_params, &alloc, &logo_bmp);
-        if (rc  != EOK) {
-                printf("Error creating bitmap.\n");
-                return 1;
-        }
+        logo_params.rect = logo_rect;
 
         rc = ui_fixed_create(&launcher.fixed);
@@ -245 +226 @@
         }
 
-        rect.p0.x = 5;
-        rect.p0.y = 32;
-        rect.p1.x = 5 + w;
-        rect.p1.y = 32 + h;
+        off.x = 5;
+        off.y = 32;
+        gfx_rect_translate(&off, &logo_rect, &rect);
         ui_image_set_rect(launcher.image, &rect);
 

uspace/app/launcher/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'draw', 'ui' ]
+deps = [ 'gfximage', 'ui' ]
 
 _images = files('gfx/helenos.tga')