# HG changeset patch # User ib # Date 1302007856 0 # Node ID ffe524b8b8f31c5c14dc728e7ee8afc256e10be4 # Parent 41485430b18afb5b1453230bbe55022161f961c2 Make len match ftell() return value type. Besides, cosmetic line changes. diff -r 41485430b18a -r ffe524b8b8f3 gui/util/bitmap.c --- a/gui/util/bitmap.c Tue Apr 05 10:44:38 2011 +0000 +++ b/gui/util/bitmap.c Tue Apr 05 12:50:56 2011 +0000 @@ -32,9 +32,9 @@ static int pngRead(unsigned char *fname, txSample *bf) { FILE *file; - int decode_ok; + long len; void *data; - int len; + int decode_ok; AVCodecContext *avctx; AVFrame *frame; AVPacket pkt; @@ -71,6 +71,7 @@ // HACK: make PNGs decode normally instead of as CorePNG delta frames pkt.flags = AV_PKT_FLAG_KEY; avcodec_decode_video2(avctx, frame, &decode_ok, &pkt); + memset(bf, 0, sizeof(*bf)); switch (avctx->pix_fmt) {