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

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/include/gfximage

Files:

• tga.h (moved) (moved from uspace/lib/gui/common.h ) (3 diffs)
• tga_gz.h (moved) (moved from uspace/lib/draw/include/draw/codec.h ) (2 diffs)

uspace/lib/gfximage/include/gfximage/tga.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2014 Martin Decky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -27 +29 @@
  */
 
-/** @addtogroup gui
+/** @addtogroup draw
  * @{
  */
@@ -34 +36 @@
  */
 
-#ifndef GUI_COMMON_H_
-#define GUI_COMMON_H_
+#ifndef GFXIMAGE_TGA_H_
+#define GFXIMAGE_TGA_H_
 
-#include <draw/drawctx.h>
+#include <errno.h>
+#include <gfx/context.h>
+#include <gfx/coord.h>
+#include <stddef.h>
 
-extern void draw_icon_cross(surface_t *, sysarg_t, sysarg_t, pixel_t, pixel_t);
-extern void draw_bevel(drawctx_t *, source_t *, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, pixel_t, pixel_t);
+extern errno_t decode_tga(gfx_context_t *, void *, size_t,
+    gfx_bitmap_t **, gfx_rect_t *);
 
 #endif

uspace/lib/gfximage/include/gfximage/tga_gz.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2014 Martin Decky
  * Copyright (c) 2011 Petr Koupy
@@ -35 +36 @@
  */
 
-#ifndef DRAW_CODEC_H_
-#define DRAW_CODEC_H_
+#ifndef GFXIMAGE_TGA_GZ_H_
+#define GFXIMAGE_TGA_GZ_H_
 
+#include <errno.h>
+#include <gfx/context.h>
+#include <gfx/coord.h>
 #include <stddef.h>
-#include "surface.h"
 
-extern surface_t *decode_tga_gz(void *, size_t, surface_flags_t);
-extern bool encode_tga_gz(surface_t *, void **, size_t *);
-extern surface_t *decode_tga(void *, size_t, surface_flags_t);
-extern bool encode_tga(surface_t *, void **, size_t *);
-extern surface_t *decode_webp(void *, size_t, surface_flags_t);
-extern bool encode_webp(surface_t *, void **, size_t *);
+extern errno_t decode_tga_gz(gfx_context_t *, void *, size_t,
+    gfx_bitmap_t **, gfx_rect_t *);
 
 #endif