diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-04-11 09:43:53 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-04-11 09:46:51 -0400 |
| commit | ee4b4cb933ca85090e5ffbbea0640be76a451e18 (patch) | |
| tree | 46ceceaa1e1fc129424324fcda6f8f3a5bae62ba /shared | |
| parent | 6412718c0d8ac7edb1b88f539f37bfa563724ca5 (diff) | |
shared: Use $(GCC_CFLAGS), fix warnings
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/Makefile.am | 1 | ||||
| -rw-r--r-- | shared/image-loader.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shared/Makefile.am b/shared/Makefile.am index d77060cc..71816f0c 100644 --- a/shared/Makefile.am +++ b/shared/Makefile.am @@ -1,5 +1,6 @@ libconfig_parser_la_LIBADD = $(IMAGE_LIBS) AM_CPPFLAGS = $(IMAGE_CFLAGS) +AM_CFLAGS = $(GCC_CFLAGS) noinst_LTLIBRARIES = libconfig-parser.la libconfig_parser_la_SOURCES = \ diff --git a/shared/image-loader.c b/shared/image-loader.c index 029b92e1..21b20a23 100644 --- a/shared/image-loader.c +++ b/shared/image-loader.c @@ -29,6 +29,8 @@ #include <png.h> #include <pixman.h> +#include "config-parser.h" + #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #ifdef HAVE_WEBP @@ -67,7 +69,8 @@ load_jpeg(FILE *fp) { struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; - int stride, i, first; + unsigned int i; + int stride, first; JSAMPLE *data, *rows[4]; jmp_buf env; @@ -350,7 +353,7 @@ load_image(const char *filename) pixman_image_t *image; unsigned char header[4]; FILE *fp; - int i; + unsigned int i; fp = fopen(filename, "rb"); if (fp == NULL) |