From c3118e7340f62236110cf87f32ea7a278ce0b275 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Fri, 11 Jul 2014 23:11:07 -0400
Subject: parse_bdf_2_1(): Set vertical offset

Also fix a variable name.
---
(limited to 'bin')

diff --git a/bin/bdf2fbcon b/bin/bdf2fbcon
index d995d9b..eafe462 100755
--- a/bin/bdf2fbcon
+++ b/bin/bdf2fbcon
@@ -266,11 +266,12 @@ sub parse_bdf_2_1
 				$font->{'chars'}[$encoding]->{'name'} = $char;
 			} elsif ($stmt eq 'BBX') {
 				$char_bbox_w = $argv[0];
-				$char_bbox_y = $argv[1];
+				$char_bbox_h = $argv[1];
 				$char_bbox_x = $argv[2];
 				$char_bbox_y = $argv[3];
 			} elsif ($stmt eq 'BITMAP') {
-				$y = 0;
+				$y = $font->{'height'} + $font_bbox_y -
+					($char_bbox_h + $char_bbox_y);
 				$section = BDF_2_1_SECTION_BITMAP;
 			}
 		} elsif ($section == BDF_2_1_SECTION_BITMAP) {
--
cgit v0.9.1