X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=fonts%2Fconvbdf;h=61307cd85fd4311b5806688e96762126521f852e;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=82e5edf70dd6edaac18a1c989f95052c7f8fc653;hpb=0585e554761612ab0808b91067a48f226bf09abe;p=bertos.git

diff --git a/fonts/convbdf b/fonts/convbdf
old mode 100755
new mode 100644
index 82e5edf7..61307cd8
--- a/fonts/convbdf
+++ b/fonts/convbdf
@@ -15,7 +15,7 @@ if ($#ARGV < 0) {
 	exit -1;
 }
 
-$LAST_CHAR = 0x7e;
+$LAST_CHAR = 0xff;
 $IMAGE_BITS = 8;
 $IMAGE_NIBBLES = $IMAGE_BITS/4;
 $IMAGE_MASK = 0xff;
@@ -24,6 +24,7 @@ $IMAGE_VERTICAL = 1;
 $file = $ARGV[0];
 
 $font = $file;
+$font =~ s#.*/##; # remove path name
 $font =~ s/\.bdf//;
 $font =~ tr/a-zA-Z0-9_/_/cs;
 
@@ -111,9 +112,9 @@ while (<BDF>) {
 	
 		# GLYPH DATA
 		if ($IMAGE_VERTICAL) {
-			for (my $x = 0; $x < $width; $x++) {
-				my $bitstring = "";
-				for (my $k = 0; $k < int(($ch_height + $IMAGE_BITS - 1) / $IMAGE_BITS); $k++) {
+			my $bitstring = "";
+			for (my $k = 0; $k < int(($ch_height + $IMAGE_BITS - 1) / $IMAGE_BITS); $k++) {
+				for (my $x = 0; $x < $width; $x++) {
 					my $v = 0;
 					for (my $y = 0; $y < $IMAGE_BITS && ($y + $k * $IMAGE_BITS < $ch_height); ++$y) {
 						my $bit = ($bm[$k * $IMAGE_BITS + $y][int($x / $IMAGE_BITS)] & (1 << ($IMAGE_BITS - ($x % $IMAGE_BITS) - 1))) ? 1 : 0;