Changeset 7e38970d in mainline for uspace/lib/gfximage/src

Timestamp:

2020-12-07T00:08:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

Location:

uspace/lib/gfximage/src

Files:

• tga.c (moved) (moved from uspace/lib/draw/codec/tga.c ) (7 diffs)
• tga_gz.c (moved) (moved from uspace/lib/draw/codec/tga.gz.c ) (1 diff)

uspace/lib/gfximage/src/tga.c

@@ -40 +40 @@
 #include <stdbool.h>
 #include <pixconv.h>
-#include <draw/codec.h>
+#include <gfx/bitmap.h>
+#include <gfximage/tga.h>
+#include <io/pixelmap.h>
 
 typedef struct {
@@ -169 +171 @@
  * alpha channel.
  *
- * @param[in] data  Memory representation of TGA.
- * @param[in] size  Size of the representation (in bytes).
- * @param[in] flags Surface creation flags.
- *
- * @return Newly allocated surface with the decoded content.
- * @return NULL on error or unsupported format.
- *
- */
-surface_t *decode_tga(void *data, size_t size, surface_flags_t flags)
+ * @param gc      Graphic context
+ * @param data    Memory representation of gzipped TGA.
+ * @param size    Size of the representation (in bytes).
+ * @param rbitmap Place to store pointer to new bitmap
+ * @param rrect   Place to store bitmap rectangle
+ *
+ * @return EOK un success or an error code
+ */
+errno_t decode_tga(gfx_context_t *gc, void *data, size_t size,
+    gfx_bitmap_t **rbitmap, gfx_rect_t *rrect)
 {
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
+        gfx_bitmap_t *bitmap = NULL;
+        pixelmap_t pixelmap;
+        errno_t rc;
+
         tga_t tga;
         if (!decode_tga_header(data, size, &tga))
-                return NULL;
+                return EINVAL;
 
         /*
@@ -192 +201 @@
         default:
                 /* Unsupported */
-                return NULL;
+                return ENOTSUP;
         }
 
@@ -198 +207 @@
         case IMG_BGRA:
                 if (tga.img_bpp != 24)
-                        return NULL;
+                        return ENOTSUP;
                 break;
         case IMG_GRAY:
                 if (tga.img_bpp != 8)
-                        return NULL;
+                        return ENOTSUP;
                 break;
         default:
                 /* Unsupported */
-                return NULL;
+                return ENOTSUP;
         }
 
         if (tga.img_alpha_bpp != 0)
-                return NULL;
+                return ENOTSUP;
 
         sysarg_t twidth = tga.startx + tga.width;
         sysarg_t theight = tga.starty + tga.height;
 
-        surface_t *surface = surface_create(twidth, theight, NULL, flags);
-        if (surface == NULL)
-                return NULL;
+        gfx_bitmap_params_init(&params);
+        params.rect.p1.x = twidth;
+        params.rect.p1.y = theight;
+
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(bitmap, &alloc);
+        if (rc != EOK) {
+                gfx_bitmap_destroy(bitmap);
+                return rc;
+        }
+
+        pixelmap.width = twidth;
+        pixelmap.height = theight;
+        pixelmap.data = alloc.pixels;
 
         /*
@@ -233 +256 @@
                                 pixel_t pixel =
                                     bgr_888_2pixel(((uint8_t *) tga.img_data) + offset);
-                                surface_put_pixel(surface, x, theight - y - 1, pixel);
+                                pixelmap_put_pixel(&pixelmap, x, theight - y - 1, pixel);
                         }
                 }
@@ -245 +268 @@
                                 pixel_t pixel =
                                     gray_8_2pixel(((uint8_t *) tga.img_data) + offset);
-                                surface_put_pixel(surface, x, theight - y - 1, pixel);
+                                pixelmap_put_pixel(&pixelmap, x, theight - y - 1, pixel);
                         }
                 }
@@ -253 +276 @@
         }
 
-        return surface;
+        *rbitmap = bitmap;
+        *rrect = params.rect;
+        return EOK;
 }
 
-/** Encode Truevision TGA format
- *
- * Encode Truevision TGA format into an array.
- *
- * @param[in]  surface Surface to be encoded into TGA.
- * @param[out] pdata   Pointer to the resulting array.
- * @param[out] psize   Pointer to the size of the resulting array.
- *
- * @return True on succesful encoding.
- * @return False on failure.
- *
- */
-bool encode_tga(surface_t *surface, void **pdata, size_t *psize)
-{
-        // TODO
-        return false;
-}
-
 /** @}
  */

uspace/lib/gfximage/src/tga_gz.c

@@ -37 +37 @@
 #include <gzip.h>
 #include <stdlib.h>
-#include <draw/codec.h>
+#include <gfximage/tga.h>
+#include <gfximage/tga_gz.h>
 
 /** Decode gzipped Truevision TGA format
  *
- * Decode gzipped Truevision TGA format and create a surface
+ * Decode gzipped Truevision TGA format and create a bitmap
  * from it. The supported variants of TGA are limited those
  * supported by decode_tga().
  *
- * @param[in] data  Memory representation of gzipped TGA.
- * @param[in] size  Size of the representation (in bytes).
- * @param[in] flags Surface creation flags.
+ * @param gc      Graphic context
+ * @param data    Memory representation of gzipped TGA.
+ * @param size    Size of the representation (in bytes).
+ * @param rbitmap Place to store pointer to new bitmap
+ * @param rrect   Place to store bitmap rectangle
  *
- * @return Newly allocated surface with the decoded content.
- * @return NULL on error or unsupported format.
- *
+ * @return EOK un success or an error code
  */
-surface_t *decode_tga_gz(void *data, size_t size, surface_flags_t flags)
+errno_t decode_tga_gz(gfx_context_t *gc, void *data, size_t size,
+    gfx_bitmap_t **rbitmap, gfx_rect_t *rrect)
 {
         void *data_expanded;
         size_t size_expanded;
+        errno_t rc;
 
-        errno_t ret = gzip_expand(data, size, &data_expanded, &size_expanded);
-        if (ret != EOK)
-                return NULL;
+        rc = gzip_expand(data, size, &data_expanded, &size_expanded);
+        if (rc != EOK)
+                return rc;
 
-        surface_t *surface = decode_tga(data_expanded, size_expanded, flags);
-
+        rc = decode_tga(gc, data_expanded, size_expanded, rbitmap, rrect);
         free(data_expanded);
-        return surface;
-}
-
-/** Encode gzipped Truevision TGA format
- *
- * Encode gzipped Truevision TGA format into an array.
- *
- * @param[in]  surface Surface to be encoded into gzipped TGA.
- * @param[out] pdata   Pointer to the resulting array.
- * @param[out] psize   Pointer to the size of the resulting array.
- *
- * @return True on succesful encoding.
- * @return False on failure.
- *
- */
-bool encode_tga_gz(surface_t *surface, void **pdata, size_t *psize)
-{
-        // TODO
-        return false;
+        return rc;
 }