From 3e1846025a4c064570c985a286e0effa73f95ed9 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 29 Jul 2002 15:25:37 +0000 Subject: [w3m-dev 03282] Re: w3m-img for framebuffer update * w3mimg/fb/fb.c (fb_image_new): ignore no image calloc multiple images (fb_image_fill): added (fb_image_draw): width, height fix (fb_image_rotate): fix typo (fb_image_copy): added (fb_frame_new): added (fb_freme_free): added (fb_frame_rotate): added * w3mimg/fb/fb.h (FB_IMAGE): add num, id, delay (fb_frame_new): added (fb_frame_free): added (fb_frame_rotate): added * w3mimg/fb/fb_gdkpixbuf.c (get_image_size): animation support (fb_image_load): animation support (draw): add bg, x, y, w, h args * w3mimg/fb/fb_img.h (fb_image_load): return FB_IMAGE** * w3mimg/fb/fb_imlib2.c (fb_image_load): return FB_IMAGE** * w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): animation support From: Hiroyuki Ito --- image.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'image.c') diff --git a/image.c b/image.c index 9deedd9..9497ea5 100644 --- a/image.c +++ b/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.10 2002/07/22 16:27:31 ukai Exp $ */ +/* $Id: image.c,v 1.11 2002/07/29 15:25:37 ukai Exp $ */ #include "fm.h" #include @@ -597,19 +597,19 @@ getImageSize(ImageCache * cache) return FALSE; tmp = Strnew(); if (!(Imgdisplay_rf && Imgdisplay_wf)) { - if (!openImgdisplay()) - return FALSE; + if (!openImgdisplay()) + return FALSE; } fputs("5;", Imgdisplay_wf); /* Get Size */ fputs(cache->file, Imgdisplay_wf); fputs("\n", Imgdisplay_wf); fflush(Imgdisplay_wf); { - char buf[1024]; - fgets(buf, sizeof(buf), Imgdisplay_rf); - if(sscanf(buf, "%d %d", &w, &h) != 2) { - return FALSE; - } + char buf[1024]; + fgets(buf, sizeof(buf), Imgdisplay_rf); + if (sscanf(buf, "%d %d", &w, &h) != 2) { + return FALSE; + } } if (!(w > 0 && h > 0)) -- cgit v1.2.3