summaryrefslogtreecommitdiff
path: root/x11/xloadimage/files
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1999-12-22 20:15:53 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1999-12-22 20:15:53 +0000
commit2628c7ca19c62940dc119669d22c6bdb1fb41b3b (patch)
tree427d87983955f4a3beeda4f567dc65753f49ea99 /x11/xloadimage/files
parentActivate nethirc (diff)
Fix a bug with tiled images.
PR: ports/15430 Submitted by: Serguei Soltan <ssoltan@usa.net>
Notes
Notes: svn path=/head/; revision=23831
Diffstat (limited to 'x11/xloadimage/files')
-rw-r--r--x11/xloadimage/files/patch-530
1 files changed, 30 insertions, 0 deletions
diff --git a/x11/xloadimage/files/patch-5 b/x11/xloadimage/files/patch-5
new file mode 100644
index 000000000000..fed5afff4d34
--- /dev/null
+++ b/x11/xloadimage/files/patch-5
@@ -0,0 +1,30 @@
+--- merge.c.orig Thu Oct 21 22:28:39 1993
++++ merge.c Sun Dec 12 03:25:45 1999
+@@ -244,6 +244,7 @@
+ int x, y;
+ unsigned int width, height, verbose;
+ { Image *base, *tmp;
++ int ycur = y;
+
+ if (verbose) {
+ printf(" Tiling...");
+@@ -260,15 +261,16 @@
+ base = newTrueImage(width, height);
+
+ while (x < base->width) {
+- while(y < base->height) {
+- tmp = merge(base, image, x, y, 0);
++ while(ycur < base->height) {
++ tmp = merge(base, image, x, ycur, 0);
+ if (tmp != base) {
+ freeImage(base);
+ base = tmp;
+ }
+- y += image->width;
++ ycur += image->width;
+ }
+ x += image->width;
++ ycur = y;
+ }
+ printf("done.\n");
+ return(base);