Changeset 3e828ea in mainline for uspace/lib/draw/include/draw/codec.h

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/lib/draw/include/draw/codec.h (moved) (moved from uspace/lib/draw/codec/tga.gz.h ) (2 diffs)

uspace/lib/draw/include/draw/codec.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2014 Martin Decky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -34 +35 @@
  */
 
-#ifndef DRAW_CODEC_TGA_GZ_H_
-#define DRAW_CODEC_TGA_GZ_H_
+#ifndef DRAW_CODEC_H_
+#define DRAW_CODEC_H_
 
 #include <stddef.h>
-#include "../surface.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 *);
 
 #endif