From 10f896399dd9215d8ae15cd64894a3b2df084fa4 Mon Sep 17 00:00:00 2001 From: Terence Boldt Date: Sun, 22 Jan 2023 12:25:11 -0500 Subject: [PATCH] Fix codacy warnings in image (#24) --- prodos/image.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/prodos/image.go b/prodos/image.go index 70a2d92..f4d1b35 100644 --- a/prodos/image.go +++ b/prodos/image.go @@ -12,7 +12,10 @@ import ( "fmt" "image" "image/color" + + // force import jpeg support by init only _ "image/jpeg" + // force import png support by init only _ "image/png" "golang.org/x/image/draw" @@ -28,9 +31,10 @@ import ( // 80 NEXT // 90 PRINT "}" // 100 PRINT CHR$ (4)"close offsets" -var offsets []int = []int{0, 1024, 2048, 3072, 4096, 5120, 6144, 7168, 128, 1152, 2176, 3200, 4224, 5248, 6272, 7296, 256, 1280, 2304, 3328, 4352, 5376, 6400, 7424, 384, 1408, 2432, 3456, 4480, 5504, 6528, 7552, 512, 1536, 2560, 3584, 4608, 5632, 6656, 7680, 640, 1664, 2688, 3712, 4736, 5760, 6784, 7808, 768, 1792, 2816, 3840, 4864, 5888, 6912, 7936, 896, 1920, 2944, 3968, 4992, 6016, 7040, 8064, 40, 1064, 2088, 3112, 4136, 5160, 6184, 7208, 168, 1192, 2216, 3240, 4264, 5288, 6312, 7336, 296, 1320, 2344, 3368, 4392, 5416, 6440, 7464, 424, 1448, 2472, 3496, 4520, 5544, 6568, 7592, 552, 1576, 2600, 3624, 4648, 5672, 6696, 7720, 680, 1704, 2728, 3752, 4776, 5800, 6824, 7848, 808, 1832, 2856, 3880, 4904, 5928, 6952, 7976, 936, 1960, 2984, 4008, 5032, 6056, 7080, 8104, 80, 1104, 2128, 3152, 4176, 5200, 6224, 7248, 208, 1232, 2256, 3280, 4304, 5328, 6352, 7376, 336, 1360, 2384, 3408, 4432, 5456, 6480, 7504, 464, 1488, 2512, 3536, 4560, 5584, 6608, 7632, 592, 1616, 2640, 3664, 4688, 5712, 6736, 7760, 720, 1744, 2768, 3792, 4816, 5840, 6864, 7888, 848, 1872, 2896, 3920, 4944, 5968, 6992, 8016, 976, 2000, 3024, 4048, 5072, 6096, 7120, 8144} -var pixel []byte = []byte{1, 2, 4, 8, 16, 32, 64} +var offsets = []int{0, 1024, 2048, 3072, 4096, 5120, 6144, 7168, 128, 1152, 2176, 3200, 4224, 5248, 6272, 7296, 256, 1280, 2304, 3328, 4352, 5376, 6400, 7424, 384, 1408, 2432, 3456, 4480, 5504, 6528, 7552, 512, 1536, 2560, 3584, 4608, 5632, 6656, 7680, 640, 1664, 2688, 3712, 4736, 5760, 6784, 7808, 768, 1792, 2816, 3840, 4864, 5888, 6912, 7936, 896, 1920, 2944, 3968, 4992, 6016, 7040, 8064, 40, 1064, 2088, 3112, 4136, 5160, 6184, 7208, 168, 1192, 2216, 3240, 4264, 5288, 6312, 7336, 296, 1320, 2344, 3368, 4392, 5416, 6440, 7464, 424, 1448, 2472, 3496, 4520, 5544, 6568, 7592, 552, 1576, 2600, 3624, 4648, 5672, 6696, 7720, 680, 1704, 2728, 3752, 4776, 5800, 6824, 7848, 808, 1832, 2856, 3880, 4904, 5928, 6952, 7976, 936, 1960, 2984, 4008, 5032, 6056, 7080, 8104, 80, 1104, 2128, 3152, 4176, 5200, 6224, 7248, 208, 1232, 2256, 3280, 4304, 5328, 6352, 7376, 336, 1360, 2384, 3408, 4432, 5456, 6480, 7504, 464, 1488, 2512, 3536, 4560, 5584, 6608, 7632, 592, 1616, 2640, 3664, 4688, 5712, 6736, 7760, 720, 1744, 2768, 3792, 4816, 5840, 6864, 7888, 848, 1872, 2896, 3920, 4944, 5968, 6992, 8016, 976, 2000, 3024, 4048, 5072, 6096, 7120, 8144} +var pixel = []byte{1, 2, 4, 8, 16, 32, 64} +// ConvertImageToHiResMonochrome converts jpeg and png images to Apple II hi-res monochrome func ConvertImageToHiResMonochrome(imageBytes []byte) []byte { img, _, err := image.Decode(bytes.NewReader(imageBytes)) @@ -66,6 +70,7 @@ func ConvertImageToHiResMonochrome(imageBytes []byte) []byte { return hires } +// ConvertImageToHiResColour converts jpeg and png images to Apple II hi-res colour func ConvertImageToHiResColour(imageBytes []byte) []byte { img, _, err := image.Decode(bytes.NewReader(imageBytes))