commit b3dbb31f4a6e45977c12b0aae1d0444a7ac103e5
parent 236d2ae4a39b46ebf5bc8a19c8f0868aa2f493e9
Author: ukai <ukai>
Date: Wed, 26 Mar 2003 15:14:19 +0000
[w3m-dev 03830] Image size of gif animation
* w3mimg/fb/fb_gdkpixbuf.c (get_animation_size): added
(get_image_size): use get_animation_size()
(fb_image_load): ditto
* w3mimg/x11/x11_w3mimg.c (get_animation_size): added
(x11_load_image): use get_animation_size()
(x11_get_image_size): ditto
From: Hiroyuki Ito <hito@crl.go.jp>
Diffstat:
3 files changed, 73 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-27 Hiroyuki Ito <hito@crl.go.jp>
+
+ * [w3m-dev 03830] Image size of gif animation
+ * w3mimg/fb/fb_gdkpixbuf.c (get_animation_size): added
+ (get_image_size): use get_animation_size()
+ (fb_image_load): ditto
+ * w3mimg/x11/x11_w3mimg.c (get_animation_size): added
+ (x11_load_image): use get_animation_size()
+ (x11_get_image_size): ditto
+
2003-03-25 Hiroyuki Ito <hito@crl.go.jp>
* [w3m-dev 03829] w3mimgdisplay -anim
diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c
@@ -11,6 +11,33 @@ static void draw(FB_IMAGE * img, int bg, int x, int y, int w, int h,
GdkPixbuf * pixbuf);
static GdkPixbuf *resize_image(GdkPixbuf * pixbuf, int width, int height);
+static void
+get_animation_size(GdkPixbufAnimation *animation, int *w, int *h)
+{
+ GList *frames;
+ int iw, ih, n, i;
+
+ frames = gdk_pixbuf_animation_get_frames(animation);
+ n = gdk_pixbuf_animation_get_num_frames(animation);
+ *w = gdk_pixbuf_animation_get_width(animation);
+ *h = gdk_pixbuf_animation_get_height(animation);
+ for (i = 0; i < n; i++) {
+ GdkPixbufFrame *frame;
+ GdkPixbuf *pixbuf;
+
+ frame = (GdkPixbufFrame *) g_list_nth_data(frames, i);
+ pixbuf = gdk_pixbuf_frame_get_pixbuf(frame);
+ iw = gdk_pixbuf_frame_get_x_offset(frame)
+ +gdk_pixbuf_get_width(pixbuf);
+ ih = gdk_pixbuf_frame_get_y_offset(frame)
+ + gdk_pixbuf_get_height(pixbuf);
+ if (iw > *w)
+ *w = iw;
+ if (ih > *h)
+ *h = ih;
+ }
+}
+
int
get_image_size(char *filename, int *w, int *h)
{
@@ -20,8 +47,7 @@ get_image_size(char *filename, int *w, int *h)
animation = gdk_pixbuf_animation_new_from_file(filename);
if (animation == NULL)
return 1;
- *w = gdk_pixbuf_animation_get_width(animation);
- *h = gdk_pixbuf_animation_get_height(animation);
+ get_animation_size(animation, w, h);
gdk_pixbuf_animation_unref(animation);
return 0;
}
@@ -41,8 +67,7 @@ fb_image_load(char *filename, int w, int h, int max_anim)
if (animation == NULL)
return NULL;
frames = gdk_pixbuf_animation_get_frames(animation);
- fw = gdk_pixbuf_animation_get_width(animation);
- fh = gdk_pixbuf_animation_get_height(animation);
+ get_animation_size(animation, &fw, &fh);
n = gdk_pixbuf_animation_get_num_frames(animation);
if (max_anim > 0) {
n = (max_anim > n) ? n : max_anim;
diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
@@ -40,6 +40,34 @@ struct x11_image {
int wait;
Pixmap *pixmap;
};
+
+static void
+get_animation_size(GdkPixbufAnimation *animation, int *w, int *h)
+{
+ GList *frames;
+ int iw, ih, n, i;
+
+ frames = gdk_pixbuf_animation_get_frames(animation);
+ n = gdk_pixbuf_animation_get_num_frames(animation);
+ *w = gdk_pixbuf_animation_get_width(animation);
+ *h = gdk_pixbuf_animation_get_height(animation);
+ for (i = 0; i < n; i++) {
+ GdkPixbufFrame *frame;
+ GdkPixbuf *pixbuf;
+
+ frame = (GdkPixbufFrame *) g_list_nth_data(frames, i);
+ pixbuf = gdk_pixbuf_frame_get_pixbuf(frame);
+ iw = gdk_pixbuf_frame_get_x_offset(frame)
+ +gdk_pixbuf_get_width(pixbuf);
+ ih = gdk_pixbuf_frame_get_y_offset(frame)
+ + gdk_pixbuf_get_height(pixbuf);
+ if (iw > *w)
+ *w = iw;
+ if (ih > *h)
+ *h = ih;
+ }
+}
+
#endif
static int
@@ -291,8 +319,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
return 0;
frames = gdk_pixbuf_animation_get_frames(animation);
n = gdk_pixbuf_animation_get_num_frames(animation);
- iw = gdk_pixbuf_animation_get_width(animation);
- ih = gdk_pixbuf_animation_get_height(animation);
+ get_animation_size(animation, &iw, &ih);
if (self->max_anim > 0) {
n = (self->max_anim > n) ? n : self->max_anim;
@@ -466,7 +493,7 @@ x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w,
#elif defined(USE_IMLIB2)
Imlib_Image im;
#elif defined(USE_GDKPIXBUF)
- GdkPixbuf *pixbuf;
+ GdkPixbufAnimation *animation;
#endif
if (self == NULL)
@@ -493,14 +520,12 @@ x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w,
*h = imlib_image_get_height();
imlib_free_image();
#elif defined(USE_GDKPIXBUF)
- pixbuf = gdk_pixbuf_new_from_file(fname);
- if (!pixbuf)
+ animation = gdk_pixbuf_animation_new_from_file(fname);
+ if (!animation)
return 0;
- *w = gdk_pixbuf_get_width(pixbuf);
- *h = gdk_pixbuf_get_height(pixbuf);
-
- gdk_pixbuf_unref(pixbuf);
+ get_animation_size(animation, w, h);
+ gdk_pixbuf_animation_unref(animation);
#endif
return 1;
}