From d8dccd0475b6806d7ba4614f26015831f267d893 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Thu, 18 Jul 2002 06:27:23 +0000
Subject: * w3mimgdisplay.c (main): '5' for w3mimgsize From: Fumitoshi UKAI 
 <ukai@debian.or.jp>

---
 ChangeLog       |  6 +++++-
 w3mimgdisplay.c | 16 ++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7e3793..a434c9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-18  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* w3mimgdisplay.c (main): '5' for w3mimgsize
+
 2002-07-18  Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
 
 	* [w3m-dev 03270] Re: w3m-img for framebuffer merged
@@ -3606,4 +3610,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.407 2002/07/18 06:23:51 ukai Exp $
+$Id: ChangeLog,v 1.408 2002/07/18 06:27:23 ukai Exp $
diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c
index e450871..31c4940 100644
--- a/w3mimgdisplay.c
+++ b/w3mimgdisplay.c
@@ -1,4 +1,4 @@
-/* $Id: w3mimgdisplay.c,v 1.3 2002/07/17 20:58:48 ukai Exp $ */
+/* $Id: w3mimgdisplay.c,v 1.4 2002/07/18 06:27:23 ukai Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -74,16 +74,16 @@ main(int argc, char **argv)
 	    fputs("\n", stdout);
 	    fflush(stdout);
 	    break;
-#if 0 /* def USE_W3MIMG_FB */
 	case '5':
-	    if (w3mimg_mode == W3MIMG_FB_MODE) {
-		IMAGE *im = fb_load_image(&buf[2], 0, 0);
-		fprintf(stdout, "%d %d\n", im->width, im->height);
-		fflush(stdout);
-		fb_free_image(im);
+	    if (w_op->init(w_op)) {
+		W3MImage img;
+		if (w_op->load_image(w_op, &img, &buf[2], 0, 0)) {
+		    fprintf(stdout, "%d %d\n", img.width, img.height);
+		    fflush(stdout);
+		    w_op->free_image(w_op, &img);
+		}
 	    }
 	    break;
-#endif
 	}
     }
     ClearImage();
-- 
cgit v1.2.3