diff options
| author | jmz <jmz@FreeBSD.org> | 2001-06-23 00:03:24 +0000 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2001-06-23 00:03:24 +0000 |
| commit | 8838dc99f8afd3ec7a1c08b3edba20a9e94a3dc2 (patch) | |
| tree | c7099949033ee27eba38638fe11da0d385824709 /x11/xloadimage | |
| parent | 6db1fe247d5d6f212229823c741b528887266dca (diff) | |
| download | FreeBSD-ports-8838dc99f8afd3ec7a1c08b3edba20a9e94a3dc2.zip FreeBSD-ports-8838dc99f8afd3ec7a1c08b3edba20a9e94a3dc2.tar.gz | |
FIx a bug with the -tile option.
PR: ports/28245
Submitted by: Rémi Guyomarch <rguyom@pobox.com>
Diffstat (limited to 'x11/xloadimage')
| -rw-r--r-- | x11/xloadimage/Makefile | 1 | ||||
| -rw-r--r-- | x11/xloadimage/files/patch-tile | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 5d472ff..6f79966 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -7,6 +7,7 @@ VERSION= 4.1 REVISION= 6 +PORTREVISION= 1 PORTNAME= xloadimage PORTVERSION= ${VERSION}.${REVISION} diff --git a/x11/xloadimage/files/patch-tile b/x11/xloadimage/files/patch-tile new file mode 100644 index 0000000..69beacd --- /dev/null +++ b/x11/xloadimage/files/patch-tile @@ -0,0 +1,31 @@ +--- merge.c~ Thu Oct 21 22:28:39 1993 ++++ merge.c Mon Jun 18 02:23:58 2001 +@@ -244,6 +244,7 @@ + int x, y; + unsigned int width, height, verbose; + { Image *base, *tmp; ++ int nx, ny; + + if (verbose) { + printf(" Tiling..."); +@@ -259,16 +260,14 @@ + else + base = newTrueImage(width, height); + +- while (x < base->width) { +- while(y < base->height) { +- tmp = merge(base, image, x, y, 0); ++ for (nx = x; nx < base->width; nx += image->width) { ++ for(ny = y; ny < base->height; ny += image->height) { ++ tmp = merge(base, image, nx, ny, 0); + if (tmp != base) { + freeImage(base); + base = tmp; + } +- y += image->width; + } +- x += image->width; + } + printf("done.\n"); + return(base); + |
