Changeset 7e38970d in mainline for uspace/lib/gfximage/src/tga_gz.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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

File:

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

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;
 }