From: ian <ian>
Date: Wed, 15 Jun 2005 00:07:02 +0000 (+0000)
Subject: xpm actual output does not output, needs debugging
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=cfa4ed9791f1469697861fc18ac1a62efb921083;p=trains.git

xpm actual output does not output, needs debugging
---

diff --git a/layout/plan-to-gui-data b/layout/plan-to-gui-data
index 4af00a8..bd7677f 100755
--- a/layout/plan-to-gui-data
+++ b/layout/plan-to-gui-data
@@ -248,7 +248,7 @@ sub xpm_cmap ($$) {
     $cmap{$cmapname}[0];
 }
 
-sub xpm_cmap_entry($$) {
+sub xpm_cmap_entry ($$$) {
     my ($cmapname,$pixchars,$rhs) = @_;
     die if exists $cmap{$cmapname}{$pixchars};
     $cmap{$cmapname}{$pixchars}= $rhs;
@@ -259,11 +259,10 @@ sub xpm_cmap_rgbpermil($@) {
     my ($pixchars, @rgb);
     die if @l % 4;
     while (@l) {
-	($pixchars, @rgb)= @l[0..3];  @l = @l[4..];
+	($pixchars, @rgb)= @l[0..3];  @l = @l[4..$#l];
 	xpm_cmap_entry($cmapname, $pixchars,
 		       sprintf("c #%04x%04x%04x",
-			       map { floor($_ * 65535.0 + 0.5) }
-			       @rgv));
+			       map { floor($_ * 65535.0 + 0.5) } @rgb));
     }
 }
 
@@ -297,7 +296,7 @@ sub angle_to_colour ($) {
 
 sub xpm_cmap_angular($$$@) {
     my ($cmapname, $invert, $alpha, @basergb) = @_;
-    my ($angnum,$angval);
+    my ($angnum,$angval,@permil,@angrgb,$i);
     for ($angnum=0; $angnum<(1<<$datum_numbits{Angle}); $angnum++) {
 	$angval= 6.0 * ($angnum+0.0) / 1<<$datum_numbits{Angle};
 	$angval += 3.0 if $invert;
@@ -311,6 +310,8 @@ sub xpm_cmap_angular($$$@) {
 }
 
 sub cmaps_define () {
+    my ($inv,$ondet);
+    
     xpm_cmap("background","background");
     xpm_cmap_rgbpermil("background",qw(- 100 100 100
 				       + 999 0 999
@@ -332,7 +333,7 @@ sub cmaps_define () {
 #---------- output ----------
 
 sub cmapdata_output_all () {
-    my ($cmapname, $stuff);
+    my ($cmapname, $stuff, $cmap, $sname, $pixchars);
     foreach $cmapname (keys %cmap) {
 	$stuff= [ ];
 	$cmap= $cmap{$cmapname};
@@ -349,8 +350,9 @@ sub cmapdata_output_all () {
 
 sub xpmdata_output_all () {
     my ($style, $namerhs, $xp, $row, $pp, $xy, $pixel);
-    foreach $namerhs (sort keys %{ $xpmdata{$style} }) {
-	foreach $style (sort keys %xpmdata) {
+    my ($y, $cmap_data, $header_data, $cmapname);
+    foreach $style (sort keys %xpmdata) {
+	foreach $namerhs (sort keys %{ $xpmdata{$style} }) {
 	    $xp= $xpmdata{$style}{$namerhs};
 die "$pp ?" if $xp->{X}{Max} >= 642;
 	    $header_data= "";