From 79d921408411de5c08978d83ce9c1e8271e6bdc3 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sat, 3 Nov 2018 05:28:16 +0300 Subject: [PATCH] refactoring --- Makefile | 2 +- src/data/blank.h | 2 +- src/data/{blank.jpg => blank.jpeg} | Bin tools/{make-jpg-h.py => make-jpeg-h.py} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/data/{blank.jpg => blank.jpeg} (100%) rename tools/{make-jpg-h.py => make-jpeg-h.py} (98%) diff --git a/Makefile b/Makefile index f66e277..693b130 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ install: $(PROG) regen: - tools/make-jpg-h.py src/data/blank.jpg src/data/blank.h BLANK 640 480 + tools/make-jpeg-h.py src/data/blank.jpeg src/data/blank.h BLANK 640 480 tools/make-html-h.py src/data/index.html src/data/html_index.h HTML_INDEX_PAGE diff --git a/src/data/blank.h b/src/data/blank.h index 97d1c55..0840f95 100644 --- a/src/data/blank.h +++ b/src/data/blank.h @@ -685,4 +685,4 @@ const unsigned char BLANK_JPG_DATA[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xd9 -}; \ No newline at end of file +}; diff --git a/src/data/blank.jpg b/src/data/blank.jpeg similarity index 100% rename from src/data/blank.jpg rename to src/data/blank.jpeg diff --git a/tools/make-jpg-h.py b/tools/make-jpeg-h.py similarity index 98% rename from tools/make-jpg-h.py rename to tools/make-jpeg-h.py index e5a0d12..fb0529c 100755 --- a/tools/make-jpg-h.py +++ b/tools/make-jpeg-h.py @@ -45,7 +45,7 @@ def main(): rows[-1].append(hex(ch)) text = ",\n\t".join(", ".join(row) for row in rows) - text = "const unsigned char %s_JPG_DATA[] = {\n\t%s\n};" % (prefix, text) + text = "const unsigned char %s_JPG_DATA[] = {\n\t%s\n};\n" % (prefix, text) text = "const unsigned long %s_JPG_SIZE = %d;\n\n" % (prefix, len(jpg_data)) + text text = "const unsigned %s_JPG_HEIGHT = %d;\n\n" % (prefix, height) + text text = "const unsigned %s_JPG_WIDTH = %d;\n" % (prefix, width) + text