w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit 9930d1c8093e619fd79e15132f6a3793cbf324fd
parent bfe15153a60f8f1b49e87c7dcb765ffa2c2962d9
Author: ukai <ukai>
Date:   Mon, 28 Oct 2002 17:09:15 +0000

[w3m-dev 03352] w3mimgsize is not necessary.
* XMakefile (IMGSIZE): removed
* config.h.dist (IMGSIZE): removed
* configure (imgtarget): remove IMGSIZE
	(config.h): remove IMGSIZE
* rc.c (CMT_IMGSIZE): removed
* doc/README.img: remove imgsize
* w3mimgsize.c: removed
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
MChangeLog | 11+++++++++++
MXMakefile | 8--------
Mconfig.h.dist | 1-
Mconfigure | 3+--
Mdoc/README.img | 2--
Mrc.c | 2--
Dw3mimgsize.c | 29-----------------------------
7 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,14 @@ +2002-10-29 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 03352] w3mimgsize is not necessary. + * XMakefile (IMGSIZE): removed + * config.h.dist (IMGSIZE): removed + * configure (imgtarget): remove IMGSIZE + (config.h): remove IMGSIZE + * rc.c (CMT_IMGSIZE): removed + * doc/README.img: remove imgsize + * w3mimgsize.c: removed + 2002-10-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> * [w3m-dev 03351] w3m core dump diff --git a/XMakefile b/XMakefile @@ -19,7 +19,6 @@ BOOKMARKER=w3mbookmark$(EXT) HELPER=w3mhelperpanel$(EXT) INFLATE=inflate$(EXT) IMGDISPLAY=w3mimgdisplay$(EXT) -IMGSIZE=w3mimgsize$(EXT) MAN1=doc/w3m.1 MAN1_JA=doc-jp/w3m.1 TARGETS=$(TARGET) $(EXT_TARGETS) @@ -96,16 +95,9 @@ $(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS) $(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGDISPLAY) \ w3mimgdisplay.o $(IMGOBJS) $(IMGLDFLAGS) -$(IMGSIZE): w3mimgsize.o $(IMGOBJS) - $(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGSIZE) \ - w3mimgsize.o $(IMGOBJS) $(IMGLDFLAGS) - w3mimgdisplay.o: w3mimgdisplay.c $(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgdisplay.c -w3mimgsize.o: w3mimgsize.c - $(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgsize.c - w3mimg/w3mimg.o: w3mimg/w3mimg.c cd w3mimg && $(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c diff --git a/config.h.dist b/config.h.dist @@ -155,7 +155,6 @@ MODEL=Linux.i686-monster-ja #define HELP_FILE "w3mhelp.html" #define HELP_CGI "w3mhelp" #define W3MCONFIG "w3mconfig" -#define IMGSIZE "w3mimgsize" #define IMGDISPLAY "w3mimgdisplay" #define XFACE2XPM "xface2xpm" diff --git a/configure b/configure @@ -797,7 +797,7 @@ fi ask_param "Inline image support" use_image n if [ "$use_image" = y ]; then def_use_image="#define USE_IMAGE" - imgtarget='$(IMGDISPLAY) $(IMGSIZE)' + imgtarget='$(IMGDISPLAY)' ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y d_w3mimg_fb=n case $sysname in @@ -2377,7 +2377,6 @@ $def_use_xface #define HELP_FILE "w3mhelp.html" #define HELP_CGI "w3mhelp" #define W3MCONFIG "w3mconfig" -#define IMGSIZE "w3mimgsize" #define IMGDISPLAY "w3mimgdisplay" #define XFACE2XPM "xface2xpm" diff --git a/doc/README.img b/doc/README.img @@ -76,8 +76,6 @@ Option panel imgdisplay External command to display image". The default value is "w3mimgdisplay". See "Setting w3mimgdisplay". - imgsize - External command to get size of image. The default value is "w3mimgsize". Required programs diff --git a/rc.c b/rc.c @@ -74,7 +74,6 @@ static char *config_file = NULL; #define CMT_EXT_IMAGE_VIEWER "画像を外部ビューワで表示" #define CMT_IMAGE_SCALE "画像のスケール(%)" #define CMT_IMGDISPLAY "画像を表示するためのコマンド" -#define CMT_IMGSIZE "画像の大きさを得るためのコマンド" #endif #define CMT_MULTICOL "ファイル名のマルチカラム表示" #define CMT_ALT_ENTITY "エンティティを ASCII の代替表現で表す" @@ -217,7 +216,6 @@ static char *config_file = NULL; #define CMT_EXT_IMAGE_VIEWER "Use external image viewer" #define CMT_IMAGE_SCALE "Scale of image (%)" #define CMT_IMGDISPLAY "External command to display image" -#define CMT_IMGSIZE "External command to get size of image" #endif #define CMT_MULTICOL "Display file names in multi-column format" #define CMT_ALT_ENTITY "Use ASCII equivalents to display entities" diff --git a/w3mimgsize.c b/w3mimgsize.c @@ -1,29 +0,0 @@ -/* $Id$ */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "config.h" -#include "w3mimg/w3mimg.h" - -int -main(int argc, char **argv) -{ - w3mimg_op *w_op = NULL; - W3MImage img; - int w, h; - - fclose(stderr); - if (argc < 2) - exit(1); - w_op = w3mimg_open(); - if (w_op == NULL) - exit(1); - - if (!w_op->init(w_op)) - exit(1); - - if (!w_op->get_image_size(w_op, &img, argv[1], &w, &h)) - exit(1); - printf("%d %d\n", w, h); - exit(0); -}