Changeset 0576df9 in mainline for uspace/app/barber/barber.c

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

File:

• uspace/app/barber/barber.c (modified) (4 diffs)

uspace/app/barber/barber.c

@@ -34 +34 @@
  */
 
-#include <draw/surface.h>
-#include <draw/codec.h>
 #include <device/led_dev.h>
 #include <errno.h>
 #include <fibril_synch.h>
+#include <gfximage/tga_gz.h>
 #include <io/pixel.h>
 #include <loc.h>
@@ -94 +93 @@
 static fibril_timer_t *frame_timer = NULL;
 static ui_image_t *frame_img;
-static surface_t *frames[FRAMES];
 static gfx_bitmap_t *frame_bmp[FRAMES];
 
@@ -123 +121 @@
 static bool decode_frames(gfx_context_t *gc)
 {
-        gfx_bitmap_alloc_t alloc;
-        surface_coord_t w, h;
-        gfx_bitmap_params_t params;
+        gfx_rect_t rect;
         errno_t rc;
 
         for (unsigned int i = 0; i < FRAMES; i++) {
-                frames[i] = decode_tga_gz(images[i].addr, images[i].size,
-                    SURFACE_FLAG_SHARED);
-                if (frames[i] == NULL) {
+                rc = decode_tga_gz(gc, images[i].addr, images[i].size,
+                    &frame_bmp[i], &rect);
+                if (rc != EOK) {
                         printf("Unable to decode frame %u.\n", i);
                         return false;
                 }
 
-                surface_get_resolution(frames[i], &w, &h);
-                gfx_bitmap_params_init(&params);
-                params.rect.p1.x = w;
-                params.rect.p1.y = h;
-
-                alloc.pitch = sizeof(uint32_t) * w;
-                alloc.off0 = 0;
-                alloc.pixels = surface_direct_access(frames[i]);
-
-                rc = gfx_bitmap_create(gc, &params, &alloc, &frame_bmp[i]);
-                if (rc != EOK) {
-                        printf("Error creating bitmap.\n");
-                        return false;
-                }
+                (void) rect;
         }
 
@@ -162 +145 @@
                 gfx_bitmap_destroy(frame_bmp[i]);
                 frame_bmp[i] = NULL;
-
-                surface_destroy(frames[i]);
-                frames[i] = NULL;
         }
 }