From owner-freebsd-ports  Sun Jun 17 17:40:31 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 0673B37B410
	for <freebsd-ports@hub.freebsd.org>; Sun, 17 Jun 2001 17:40:09 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.3/8.11.3) id f5I0e8112161;
	Sun, 17 Jun 2001 17:40:08 -0700 (PDT)
	(envelope-from gnats)
Received: from smtp1.cluster.oleane.net (smtp1.cluster.oleane.net [195.25.12.16])
	by hub.freebsd.org (Postfix) with ESMTP
	id EBF6D37B401; Sun, 17 Jun 2001 17:39:31 -0700 (PDT)
	(envelope-from rguyom@pobox.com)
Received: from diabolic-cow.chatgris.net (dyn-1-1-010.Orl.dialup.oleane.fr [195.25.26.10]) by smtp1.cluster.oleane.net with ESMTP id f5I0dT029262; Mon, 18 Jun 2001 02:39:29 +0200 (CEST)
Received: by diabolic-cow.chatgris.net (Postfix, from userid 1000)
	id 644CC277; Mon, 18 Jun 2001 02:38:29 +0200 (CEST)
Message-Id: <20010618003829.644CC277@diabolic-cow.chatgris.net>
Date: Mon, 18 Jun 2001 02:38:29 +0200 (CEST)
From: rguyom@pobox.com
Reply-To: rguyom@pobox.com
To: FreeBSD-gnats-submit@freebsd.org
Cc: jmz@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/28245: bug in x11/xloadimage -tile option
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         28245
>Category:       ports
>Synopsis:       bug in x11/xloadimage -tile option
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 17 17:40:08 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Rémi Guyomarch
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD diabolic-cow.chatgris.net 4.3-STABLE FreeBSD 4.3-STABLE #7: Sun Apr 22 21:57:27 CEST 2001 root@diabolic-cow.chatgris.net:/usr/obj/usr/src/sys/DIABOLIC-COW i386
Port:	xloadimage-4.1.6
>Description:

	See next section.
	
>How-To-Repeat:
	xloadimage -tile <some_image_file_smaller_in_x_and_y_than_your_screen>
>Fix:

--- 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);

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message