From 0c97f24173d461cd07e06da5f419bd1238cbd6e6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 1 Sep 2015 23:56:23 +0100 Subject: add a basic decode test --- Makefile | 6 ++ examples/decode_gif.c | 211 ------------------------------------------------- examples/gif_display | 3 + examples/waves.gif | Bin 186913 -> 0 bytes gif_display | 3 - test/Makefile | 3 + test/data/waves.gif | Bin 0 -> 186913 bytes test/decode_gif.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++ test/runtest.sh | 18 +++++ 9 files changed, 245 insertions(+), 214 deletions(-) delete mode 100644 examples/decode_gif.c create mode 100755 examples/gif_display delete mode 100644 examples/waves.gif delete mode 100755 gif_display create mode 100644 test/Makefile create mode 100644 test/data/waves.gif create mode 100644 test/decode_gif.c create mode 100755 test/runtest.sh diff --git a/Makefile b/Makefile index 8504332..c78ee16 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,9 @@ PREFIX ?= /opt/netsurf NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem include $(NSSHARED)/makefiles/Makefile.tools +# Reevaluate when used, as BUILDDIR won't be defined yet +TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT) + # Toolchain flags WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ @@ -34,6 +37,9 @@ else CFLAGS := $(CFLAGS) -Dinline="__inline__" endif +TESTCFLAGS := -g -O2 +TESTLDFLAGS := -lm -l$(COMPONENT) $(TESTLDFLAGS) + include $(NSBUILD)/Makefile.top # Extra installation rules diff --git a/examples/decode_gif.c b/examples/decode_gif.c deleted file mode 100644 index 34d2e9d..0000000 --- a/examples/decode_gif.c +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright 2008 Sean Fox - * Copyright 2008 James Bursa - * - * This file is part of NetSurf's libnsgif, http://www.netsurf-browser.org/ - * Licenced under the MIT License, - * http://www.opensource.org/licenses/mit-license.php - */ - -#include -#include -#include -#include -#include -#include -#include -#include "../libnsgif.h" - -unsigned char *load_file(const char *path, size_t *data_size); -void warning(const char *context, int code); -void *bitmap_create(int width, int height); -void bitmap_set_opaque(void *bitmap, bool opaque); -bool bitmap_test_opaque(void *bitmap); -unsigned char *bitmap_get_buffer(void *bitmap); -void bitmap_destroy(void *bitmap); -void bitmap_modified(void *bitmap); - - -int main(int argc, char *argv[]) -{ - gif_bitmap_callback_vt bitmap_callbacks = { - bitmap_create, - bitmap_destroy, - bitmap_get_buffer, - bitmap_set_opaque, - bitmap_test_opaque, - bitmap_modified - }; - gif_animation gif; - size_t size; - gif_result code; - unsigned int i; - - if (argc != 2) { - fprintf(stderr, "Usage: %s image.gif\n", argv[0]); - return 1; - } - - /* create our gif animation */ - gif_create(&gif, &bitmap_callbacks); - - /* load file into memory */ - unsigned char *data = load_file(argv[1], &size); - - /* begin decoding */ - do { - code = gif_initialise(&gif, size, data); - if (code != GIF_OK && code != GIF_WORKING) { - warning("gif_initialise", code); - exit(1); - } - } while (code != GIF_OK); - - printf("P3\n"); - printf("# %s\n", argv[1]); - printf("# width %u \n", gif.width); - printf("# height %u \n", gif.height); - printf("# frame_count %u \n", gif.frame_count); - printf("# frame_count_partial %u \n", gif.frame_count_partial); - printf("# loop_count %u \n", gif.loop_count); - printf("%u %u 256\n", gif.width, gif.height * gif.frame_count); - - /* decode the frames */ - for (i = 0; i != gif.frame_count; i++) { - unsigned int row, col; - unsigned char *image; - - code = gif_decode_frame(&gif, i); - if (code != GIF_OK) - warning("gif_decode_frame", code); - - printf("# frame %u:\n", i); - image = (unsigned char *) gif.frame_image; - for (row = 0; row != gif.height; row++) { - for (col = 0; col != gif.width; col++) { - size_t z = (row * gif.width + col) * 4; - printf("%u %u %u ", - (unsigned char) image[z], - (unsigned char) image[z + 1], - (unsigned char) image[z + 2]); - } - printf("\n"); - } - } - - /* clean up */ - gif_finalise(&gif); - free(data); - - return 0; -} - - -unsigned char *load_file(const char *path, size_t *data_size) -{ - FILE *fd; - struct stat sb; - unsigned char *buffer; - size_t size; - size_t n; - - fd = fopen(path, "rb"); - if (!fd) { - perror(path); - exit(EXIT_FAILURE); - } - - if (stat(path, &sb)) { - perror(path); - exit(EXIT_FAILURE); - } - size = sb.st_size; - - buffer = malloc(size); - if (!buffer) { - fprintf(stderr, "Unable to allocate %lld bytes\n", - (long long) size); - exit(EXIT_FAILURE); - } - - n = fread(buffer, 1, size, fd); - if (n != size) { - perror(path); - exit(EXIT_FAILURE); - } - - fclose(fd); - - *data_size = size; - return buffer; -} - - -void warning(const char *context, gif_result code) -{ - fprintf(stderr, "%s failed: ", context); - switch (code) - { - case GIF_INSUFFICIENT_FRAME_DATA: - fprintf(stderr, "GIF_INSUFFICIENT_FRAME_DATA"); - break; - case GIF_FRAME_DATA_ERROR: - fprintf(stderr, "GIF_FRAME_DATA_ERROR"); - break; - case GIF_INSUFFICIENT_DATA: - fprintf(stderr, "GIF_INSUFFICIENT_DATA"); - break; - case GIF_DATA_ERROR: - fprintf(stderr, "GIF_DATA_ERROR"); - break; - case GIF_INSUFFICIENT_MEMORY: - fprintf(stderr, "GIF_INSUFFICIENT_MEMORY"); - break; - default: - fprintf(stderr, "unknown code %i", code); - break; - } - fprintf(stderr, "\n"); -} - - -void *bitmap_create(int width, int height) -{ - return calloc(width * height, 4); -} - - -void bitmap_set_opaque(void *bitmap, bool opaque) -{ - (void) opaque; /* unused */ - assert(bitmap); -} - - -bool bitmap_test_opaque(void *bitmap) -{ - assert(bitmap); - return false; -} - - -unsigned char *bitmap_get_buffer(void *bitmap) -{ - assert(bitmap); - return bitmap; -} - - -void bitmap_destroy(void *bitmap) -{ - assert(bitmap); - free(bitmap); -} - - -void bitmap_modified(void *bitmap) -{ - assert(bitmap); - return; -} - diff --git a/examples/gif_display b/examples/gif_display new file mode 100755 index 0000000..7e50b8c --- /dev/null +++ b/examples/gif_display @@ -0,0 +1,3 @@ +set -e +make +bin/decode_gif $1 | display diff --git a/examples/waves.gif b/examples/waves.gif deleted file mode 100644 index 46a7da3..0000000 Binary files a/examples/waves.gif and /dev/null differ diff --git a/gif_display b/gif_display deleted file mode 100755 index 7e50b8c..0000000 --- a/gif_display +++ /dev/null @@ -1,3 +0,0 @@ -set -e -make -bin/decode_gif $1 | display diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 0000000..f067d81 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,3 @@ +DIR_TEST_ITEMS := decode_gif:decode_gif.c + +include $(NSBUILD)/Makefile.subdir diff --git a/test/data/waves.gif b/test/data/waves.gif new file mode 100644 index 0000000..46a7da3 Binary files /dev/null and b/test/data/waves.gif differ diff --git a/test/decode_gif.c b/test/decode_gif.c new file mode 100644 index 0000000..2d2f37a --- /dev/null +++ b/test/decode_gif.c @@ -0,0 +1,215 @@ +/* + * Copyright 2008 Sean Fox + * Copyright 2008 James Bursa + * + * This file is part of NetSurf's libnsgif, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "../include/libnsgif.h" + +unsigned char *load_file(const char *path, size_t *data_size); +void warning(const char *context, int code); +void *bitmap_create(int width, int height); +void bitmap_set_opaque(void *bitmap, bool opaque); +bool bitmap_test_opaque(void *bitmap); +unsigned char *bitmap_get_buffer(void *bitmap); +void bitmap_destroy(void *bitmap); +void bitmap_modified(void *bitmap); + + +int main(int argc, char *argv[]) +{ + gif_bitmap_callback_vt bitmap_callbacks = { + bitmap_create, + bitmap_destroy, + bitmap_get_buffer, + bitmap_set_opaque, + bitmap_test_opaque, + bitmap_modified + }; + gif_animation gif; + size_t size; + gif_result code; + unsigned int i; + + if (argc != 2) { + fprintf(stderr, "Usage: %s image.gif\n", argv[0]); + return 1; + } + + /* create our gif animation */ + gif_create(&gif, &bitmap_callbacks); + + /* load file into memory */ + unsigned char *data = load_file(argv[1], &size); + + /* begin decoding */ + do { + code = gif_initialise(&gif, size, data); + if (code != GIF_OK && code != GIF_WORKING) { + warning("gif_initialise", code); + exit(1); + } + } while (code != GIF_OK); + + printf("P3\n"); + printf("# %s\n", argv[1]); + printf("# width %u \n", gif.width); + printf("# height %u \n", gif.height); + printf("# frame_count %u \n", gif.frame_count); + printf("# frame_count_partial %u \n", gif.frame_count_partial); + printf("# loop_count %u \n", gif.loop_count); + printf("%u %u 256\n", gif.width, gif.height * gif.frame_count); + + /* decode the frames */ + for (i = 0; i != gif.frame_count; i++) { + unsigned int row, col; + unsigned char *image; + + code = gif_decode_frame(&gif, i); + if (code != GIF_OK) + warning("gif_decode_frame", code); + + printf("# frame %u:\n", i); + image = (unsigned char *) gif.frame_image; + for (row = 0; row != gif.height; row++) { + for (col = 0; col != gif.width; col++) { + size_t z = (row * gif.width + col) * 4; + printf("%u %u %u ", + (unsigned char) image[z], + (unsigned char) image[z + 1], + (unsigned char) image[z + 2]); + } + printf("\n"); + } + } + + /* clean up */ + gif_finalise(&gif); + free(data); + + return 0; +} + + +unsigned char *load_file(const char *path, size_t *data_size) +{ + FILE *fd; + struct stat sb; + unsigned char *buffer; + size_t size; + size_t n; + + fd = fopen(path, "rb"); + if (!fd) { + perror(path); + exit(EXIT_FAILURE); + } + + if (stat(path, &sb)) { + perror(path); + exit(EXIT_FAILURE); + } + size = sb.st_size; + + buffer = malloc(size); + if (!buffer) { + fprintf(stderr, "Unable to allocate %lld bytes\n", + (long long) size); + exit(EXIT_FAILURE); + } + + n = fread(buffer, 1, size, fd); + if (n != size) { + perror(path); + exit(EXIT_FAILURE); + } + + fclose(fd); + + *data_size = size; + return buffer; +} + + +void warning(const char *context, gif_result code) +{ + fprintf(stderr, "%s failed: ", context); + switch (code) + { + case GIF_INSUFFICIENT_FRAME_DATA: + fprintf(stderr, "GIF_INSUFFICIENT_FRAME_DATA"); + break; + case GIF_FRAME_DATA_ERROR: + fprintf(stderr, "GIF_FRAME_DATA_ERROR"); + break; + case GIF_INSUFFICIENT_DATA: + fprintf(stderr, "GIF_INSUFFICIENT_DATA"); + break; + case GIF_DATA_ERROR: + fprintf(stderr, "GIF_DATA_ERROR"); + break; + case GIF_INSUFFICIENT_MEMORY: + fprintf(stderr, "GIF_INSUFFICIENT_MEMORY"); + break; + default: + fprintf(stderr, "unknown code %i", code); + break; + } + fprintf(stderr, "\n"); +} + + +void *bitmap_create(int width, int height) +{ + return calloc(width * height, 4); +} + + +void bitmap_set_opaque(void *bitmap, bool opaque) +{ + (void) opaque; /* unused */ + (void) bitmap; /* unused */ + assert(bitmap); +} + + +bool bitmap_test_opaque(void *bitmap) +{ + (void) bitmap; /* unused */ + assert(bitmap); + return false; +} + + +unsigned char *bitmap_get_buffer(void *bitmap) +{ + assert(bitmap); + return bitmap; +} + + +void bitmap_destroy(void *bitmap) +{ + assert(bitmap); + free(bitmap); +} + + +void bitmap_modified(void *bitmap) +{ + (void) bitmap; /* unused */ + assert(bitmap); + return; +} + diff --git a/test/runtest.sh b/test/runtest.sh new file mode 100755 index 0000000..063db28 --- /dev/null +++ b/test/runtest.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +TEST_PATH=$1 +TEST_OUT=${TEST_PATH}/ppm + +mkdir -p ${TEST_OUT} + +gifdecode() +{ + OUTF=$(basename ${1} .gif) + ${TEST_PATH}/test_decode_gif ${1} > ${TEST_OUT}/${OUTF}.ppm +} + + +for GIF in $(ls test/data/*.gif);do + gifdecode ${GIF} +done + -- cgit v1.2.3