<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14758">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fb_tools/bdf_to_c.py: make it compatible with python3<br><br>This would break python2 compatibility.<br><br>Change-Id: Iaa20dd0aafa20e36186cf8dfe4d0ac9ab638f235<br>---<br>M src/host/fb_tools/bdf_to_c.py<br>1 file changed, 33 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/fb_tools/bdf_to_c.py b/src/host/fb_tools/bdf_to_c.py</span><br><span>index 86be6a6..ebeb7f9 100755</span><br><span>--- a/src/host/fb_tools/bdf_to_c.py</span><br><span>+++ b/src/host/fb_tools/bdf_to_c.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> # -*- coding: utf-8 -*-</span><br><span> </span><br><span> '''</span><br><span>@@ -133,7 +133,7 @@</span><br><span> arr = l.split(None,1)</span><br><span> if len(arr) < 2 and \</span><br><span> arr[0].lower() != 'STARTCHAR' :</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'Not start of glyph: %s'%(l)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Not start of glyph: %s'%(l), file=sys.stderr)</span><br><span> continue</span><br><span> inchar = unique_name(arr[1],self.glyphs)</span><br><span> continue</span><br><span>@@ -159,7 +159,7 @@</span><br><span> continue</span><br><span> </span><br><span> if len(arr) < 2 :</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'Bad line in font: %s'%(l)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Bad line in font: %s'%(l), file=sys.stderr)</span><br><span> continue</span><br><span> data[arr[0].lower()] = arr[1]</span><br><span> </span><br><span>@@ -183,40 +183,40 @@</span><br><span> </span><br><span> if opts.firstchar == None :</span><br><span> opts.firstchar = min(font.enc)</span><br><span style="color: hsl(0, 100%, 40%);">- print 'First character in font: %d, %s'%(opts.firstchar,</span><br><span style="color: hsl(0, 100%, 40%);">- font.enc[opts.firstchar])</span><br><span style="color: hsl(120, 100%, 40%);">+ print('First character in font: %d, %s'%(opts.firstchar,</span><br><span style="color: hsl(120, 100%, 40%);">+ font.enc[opts.firstchar]))</span><br><span> </span><br><span> if opts.lastchar == None :</span><br><span> opts.lastchar = max(font.enc)</span><br><span style="color: hsl(0, 100%, 40%);">- print 'Last character in font: %d, %s'%(opts.lastchar,</span><br><span style="color: hsl(0, 100%, 40%);">- font.enc[opts.lastchar])</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Last character in font: %d, %s'%(opts.lastchar,</span><br><span style="color: hsl(120, 100%, 40%);">+ font.enc[opts.lastchar]))</span><br><span> </span><br><span> if opts.base == None :</span><br><span> opts.base = 'font_'+os.path.basename(args[0])</span><br><span> if opts.base[-4:] == '.bdf' :</span><br><span> opts.base = opts.base[:-4]</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'Guessing symbol prefix to be %s.'%(opts.base)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Guessing symbol prefix to be %s.'%(opts.base), file=sys.stderr)</span><br><span> </span><br><span> if opts.out == None :</span><br><span> opts.out = os.path.basename(args[0])</span><br><span> if opts.out[-4:] == '.bdf' :</span><br><span> opts.out = opts.out[:-4]</span><br><span> opts.out = opts.out + '.c'</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'Guessing output filename to be %s.'%(opts.out)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Guessing output filename to be %s.'%(opts.out), file=sys.stderr)</span><br><span> </span><br><span> if os.path.exists(opts.out) :</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'Will *NOT* overwrite existing file when guessing output!'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('Will *NOT* overwrite existing file when guessing output!', file=sys.stderr)</span><br><span> sys.exit(1)</span><br><span> </span><br><span> of = file(opts.out,'w')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'#include <fb/font.h>'</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'/* file autogenerated by %s */'%(sys.argv[0])</span><br><span style="color: hsl(120, 100%, 40%);">+ print('#include <fb/font.h>', file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('/* file autogenerated by %s */' %(sys.argv[0]), file=of)</span><br><span> </span><br><span> offsets = list()</span><br><span> glyphnames = list()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'static const uint8_t %s_data[] = {'%(opts.base)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('static const uint8_t %s_data[] = {'%(opts.base), file=of)</span><br><span> </span><br><span> pos = 0</span><br><span> </span><br><span>@@ -236,8 +236,8 @@</span><br><span> bitmap = glyph['bitmap']</span><br><span> </span><br><span> if bbx[1] != len(bitmap) :</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'ERROR: glyph',charname,'has wrong number of lines of data!'</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,' want: ',bbx[1],'but have',len(bitmap)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('ERROR: glyph',charname,'has wrong number of lines of data!', file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ print(' want: ',bbx[1],'but have',len(bitmap), file=sys.stderr)</span><br><span> sys.exit(1)</span><br><span> </span><br><span> removedrows = 0</span><br><span>@@ -254,40 +254,40 @@</span><br><span> bitmap = bitmap[:-1]</span><br><span> </span><br><span> if removedrows > 0 :</span><br><span style="color: hsl(0, 100%, 40%);">- print "Glyph %s: removed %d rows."%(charname,removedrows)</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Glyph %s: removed %d rows."%(charname,removedrows))</span><br><span> </span><br><span> w = int(glyph['dwidth'].split(None,1)[0])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'/* --- new character %s %s starting at offset 0x%04x --- */'%(</span><br><span style="color: hsl(0, 100%, 40%);">- charname,ascii_charnum(i),pos)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t/*%04x:*/\t%d, %d, %d, %d, %d, /* width and bbox (w,h,x,y) */'%(</span><br><span style="color: hsl(0, 100%, 40%);">- pos,w,bbx[0],bbx[1],bbx[2],bbx[3])</span><br><span style="color: hsl(120, 100%, 40%);">+ print('/* --- new character %s %s starting at offset 0x%04x --- */'%(</span><br><span style="color: hsl(120, 100%, 40%);">+ charname,ascii_charnum(i),pos), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t/*%04x:*/\t%d, %d, %d, %d, %d, /* width and bbox (w,h,x,y) */'%(</span><br><span style="color: hsl(120, 100%, 40%);">+ pos,w,bbx[0],bbx[1],bbx[2],bbx[3]), file=of)</span><br><span> </span><br><span> pos += 5</span><br><span> </span><br><span> for k,l in enumerate(bitmap) :</span><br><span> bytes = [ int(l[i:i+2],16) for i in range(0,len(l),2) ]</span><br><span> if len(bytes) != (bbx[0]+7)/8 :</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,'ERROR: glyph',charname,'has wrong # of bytes'</span><br><span style="color: hsl(0, 100%, 40%);">- print >>sys.stderr,' per line. Want',(bbx[0]+7)/8,'have',len(bytes)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('ERROR: glyph',charname,'has wrong # of bytes', file=sys.stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ print(' per line. Want',(bbx[0]+7)/8,'have',len(bytes), file=sys.stderr)</span><br><span> sys.exit(1)</span><br><span> cdata = ','.join([ '0x%02x'%v for v in bytes ])</span><br><span> comment = ''.join([ byte_to_bits(b) for b in bytes ])</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t/*%04x:*/\t'%(pos)+cdata+', /* '+comment+' */'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t/*%04x:*/\t'%(pos)+cdata+', /* '+comment+' */', file=of)</span><br><span> pos += len(bytes)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,"};"</span><br><span style="color: hsl(120, 100%, 40%);">+ print("};", file=of)</span><br><span> </span><br><span> x = ',\n\t'.join(['0x%04x /* %s */'%(w,n) for w,n in zip(offsets,glyphnames)])</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'static const uint16_t %s_offsets[] = {\n\t%s\n};'%(opts.base,x)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('static const uint16_t %s_offsets[] = {\n\t%s\n};'%(opts.base,x), file=of)</span><br><span> </span><br><span> height = font.ascent + font.descent</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'const struct fb_font %s = {'%(opts.base)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.height = %d,'%(height)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.ascent = %d,'%(font.ascent)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.firstchar = %d, /* %s */'%(opts.firstchar,font.enc.get(opts.firstchar,"?"))</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.lastchar = %d, /* %s */'%(opts.lastchar,font.enc.get(opts.lastchar,"?"))</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.chardata = %s_data,'%(opts.base)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'\t.charoffs = %s_offsets,'%(opts.base)</span><br><span style="color: hsl(0, 100%, 40%);">- print >>of,'};'</span><br><span style="color: hsl(120, 100%, 40%);">+ print('const struct fb_font %s = {'%(opts.base), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.height = %d,'%(height), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.ascent = %d,'%(font.ascent), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.firstchar = %d, /* %s */'%(opts.firstchar,font.enc.get(opts.firstchar,"?")), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.lastchar = %d, /* %s */'%(opts.lastchar,font.enc.get(opts.lastchar,"?")), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.chardata = %s_data,'%(opts.base), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('\t.charoffs = %s_offsets,'%(opts.base), file=of)</span><br><span style="color: hsl(120, 100%, 40%);">+ print('};', file=of)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/14758">change 14758</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/14758"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaa20dd0aafa20e36186cf8dfe4d0ac9ab638f235 </div>
<div style="display:none"> Gerrit-Change-Number: 14758 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>