Merge pull request #16 from damieng/clean-up

Minor clean up of code
damieng · Oct 21, 2022 · 55f5bf4 · 55f5bf4
2 parents 856a3f2 + 9b2409c
commit 55f5bf4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Common/DumpScanners/SpectrumDumpScanner.cs b/Common/DumpScanners/SpectrumDumpScanner.cs
@@ -14,7 +14,7 @@ public static class SpectrumDumpScanner
     {
         public static List<Font> Read(BinaryReader reader, string name)
         {
-            var buffer = reader.ReadBytes(1024 * 1024); // 1MB is enough for any Speccy
+            var buffer = reader.ReadBytes(1024 * 2048); // 2MB is enough for any Speccy
 
             var offsets = GetOffsets(buffer);
 
@@ -28,6 +28,7 @@ public static List<Font> Read(BinaryReader reader, string name)
 
         private static IEnumerable<int> GetOffsets(byte[] buffer)
         {
+            var address = buffer.Length == 65536 ? 16384 : 0;
             var candidates = SpectrumDisplay.GetCandidates(buffer, 16384);
 
             var rst = EnvironmentGuidedFinder.FindOffsets(buffer);

diff --git a/Common/Formatters/CHeaderFontFormatter.cs b/Common/Formatters/CHeaderFontFormatter.cs
@@ -23,7 +23,7 @@ public static void CreateFontHeaderConst(string byteType, List<string> fileNames
                 output.AppendLine($"static const {byteType} FONT_{cFontName}_BITMAP[] = {{");
                 foreach (var glyph in font.Glyphs)
                 {
-                    output.Append("\t");
+                    output.Append('\t');
                     for (var y = 0; y < font.Height; y++)
                     {
                         var b = new Byte();

diff --git a/Common/Formatters/FzxFontFormatter.cs b/Common/Formatters/FzxFontFormatter.cs
@@ -8,8 +8,7 @@ namespace PixelWorld.Formatters
 {
     public static class FZXFontFormatter
     {
-        public static void Write(Font font, Stream output, IReadOnlyDictionary<int, char> charset,
-            bool makeProportional = false)
+        public static void Write(Font font, Stream output, bool makeProportional = false)
         {
             if (makeProportional)
                 font = FontSpacer.MakeProportional(font);

diff --git a/Common/Tools/ConvertTo.cs b/Common/Tools/ConvertTo.cs
@@ -64,7 +64,7 @@ public static void FZX(List<string> fileNames, IReadOnlyDictionary<int, char> ch
                 using var reader = new BinaryReader(source);
                 var font = ByteFontFormatter.Create(reader, Path.GetFileNameWithoutExtension(fileName), 0, charset);
                 using var target = File.Create(Utils.MakeFileName(fileName, "fzx", outputFolder));
-                FZXFontFormatter.Write(font, target, Spectrum.UK, makeProportional);
+                FZXFontFormatter.Write(font, target, makeProportional);
             }
         }