From 1627440a374239e7aef20906e0417fcb2dc10f61 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 13 Apr 2016 15:00:17 +0100 Subject: [PATCH] remove a couple of IMAGE still loads left, of course --- libvips/iofuncs/region.c | 4 ++-- libvips/iofuncs/window.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libvips/iofuncs/region.c b/libvips/iofuncs/region.c index 9dd493b1..ad7035e2 100644 --- a/libvips/iofuncs/region.c +++ b/libvips/iofuncs/region.c @@ -246,7 +246,7 @@ vips__region_start( VipsRegion *region ) void vips__region_stop( VipsRegion *region ) { - IMAGE *image = region->im; + VipsImage *image = region->im; if( region->seq && image->stop_fn ) { int result; @@ -1390,7 +1390,7 @@ static int vips_region_prepare_to_generate( VipsRegion *reg, VipsRegion *dest, VipsRect *r, int x, int y ) { - IMAGE *im = reg->im; + VipsImage *im = reg->im; VipsPel *p; if( !im->generate_fn ) { diff --git a/libvips/iofuncs/window.c b/libvips/iofuncs/window.c index d18f8681..9a519c75 100644 --- a/libvips/iofuncs/window.c +++ b/libvips/iofuncs/window.c @@ -131,7 +131,7 @@ vips_window_free( VipsWindow *window ) int vips_window_unref( VipsWindow *window ) { - IMAGE *im = window->im; + VipsImage *im = window->im; g_mutex_lock( im->sslock ); @@ -269,7 +269,7 @@ vips_window_set( VipsWindow *window, int top, int height ) /* Make a new window. */ static VipsWindow * -vips_window_new( IMAGE *im, int top, int height ) +vips_window_new( VipsImage *im, int top, int height ) { VipsWindow *window; @@ -320,7 +320,7 @@ vips_window_fits( VipsWindow *window, request_t *req ) /* Find an existing window that fits within top/height and return a ref. */ static VipsWindow * -vips_window_find( IMAGE *im, int top, int height ) +vips_window_find( VipsImage *im, int top, int height ) { request_t req; VipsWindow *window; @@ -346,7 +346,7 @@ vips_window_find( IMAGE *im, int top, int height ) /* Return a ref to a window that encloses top/height. */ VipsWindow * -vips_window_ref( IMAGE *im, int top, int height ) +vips_window_ref( VipsImage *im, int top, int height ) { VipsWindow *window;