shared: Use $(GCC_CFLAGS), fix warnings

Kristian Høgsberg 13 years ago
parent 6412718c0d
commit ee4b4cb933
  1. 1
      shared/Makefile.am
  2. 7
      shared/image-loader.c

@ -1,5 +1,6 @@
libconfig_parser_la_LIBADD = $(IMAGE_LIBS) libconfig_parser_la_LIBADD = $(IMAGE_LIBS)
AM_CPPFLAGS = $(IMAGE_CFLAGS) AM_CPPFLAGS = $(IMAGE_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
noinst_LTLIBRARIES = libconfig-parser.la noinst_LTLIBRARIES = libconfig-parser.la
libconfig_parser_la_SOURCES = \ libconfig_parser_la_SOURCES = \

@ -29,6 +29,8 @@
#include <png.h> #include <png.h>
#include <pixman.h> #include <pixman.h>
#include "config-parser.h"
#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
#ifdef HAVE_WEBP #ifdef HAVE_WEBP
@ -67,7 +69,8 @@ load_jpeg(FILE *fp)
{ {
struct jpeg_decompress_struct cinfo; struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr; struct jpeg_error_mgr jerr;
int stride, i, first; unsigned int i;
int stride, first;
JSAMPLE *data, *rows[4]; JSAMPLE *data, *rows[4];
jmp_buf env; jmp_buf env;
@ -350,7 +353,7 @@ load_image(const char *filename)
pixman_image_t *image; pixman_image_t *image;
unsigned char header[4]; unsigned char header[4];
FILE *fp; FILE *fp;
int i; unsigned int i;
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (fp == NULL) if (fp == NULL)

Loading…
Cancel
Save