Index: uspace/lib/draw/codec/tga.c =================================================================== --- uspace/lib/draw/codec/tga.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ uspace/lib/draw/codec/tga.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -40,5 +40,5 @@ #include #include -#include "tga.h" +#include typedef struct { Index: uspace/lib/draw/codec/tga.gz.c =================================================================== --- uspace/lib/draw/codec/tga.gz.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ uspace/lib/draw/codec/tga.gz.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -37,6 +37,5 @@ #include #include -#include "tga.gz.h" -#include "tga.h" +#include /** Decode gzipped Truevision TGA format Index: uspace/lib/draw/codec/tga.gz.h =================================================================== --- uspace/lib/draw/codec/tga.gz.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2014 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_CODEC_TGA_GZ_H_ -#define DRAW_CODEC_TGA_GZ_H_ - -#include -#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 *); - -#endif - -/** @} - */ Index: uspace/lib/draw/codec/tga.h =================================================================== --- uspace/lib/draw/codec/tga.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ (revision ) @@ -1,49 +1,0 @@ -/* - * Copyright (c) 2011 Martin Decky - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_CODEC_TGA_H_ -#define DRAW_CODEC_TGA_H_ - -#include -#include "../surface.h" - -extern surface_t *decode_tga(void *, size_t, surface_flags_t); -extern bool encode_tga(surface_t *, void **, size_t *); - -#endif - -/** @} - */ Index: uspace/lib/draw/codec/webp.c =================================================================== --- uspace/lib/draw/codec/webp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ uspace/lib/draw/codec/webp.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -42,5 +42,5 @@ #include #include -#include "webp.h" +#include /** Check for input buffer overrun condition */ Index: uspace/lib/draw/codec/webp.h =================================================================== --- uspace/lib/draw/codec/webp.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2014 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_CODEC_WEBP_H_ -#define DRAW_CODEC_WEBP_H_ - -#include -#include "../surface.h" - -extern surface_t *decode_webp(void *, size_t, surface_flags_t); -extern bool encode_webp(surface_t *, void **, size_t *); - -#endif - -/** @} - */