Changeset 9fb0db9 in thomson

Timestamp:

Mar 7, 2013, 10:29:47 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

6b23e9a

Parents:

62e3665

Message:

Allow gfx with less than 200px height.
Allow to set the color for unused cells.

git-svn-id: ​svn://localhost/thomson@41 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

Location:

tools/gfx2mo5

Files:

• libraw2mo5.c (modified) (4 diffs)
• libraw2mo5.h (modified) (1 diff)
• png2mo5.c (modified) (1 diff)

tools/gfx2mo5/libraw2mo5.c

@@ -11 +11 @@
 #include <string.h>
 
-unsigned char *raw2mo5(unsigned char *input, bool fixup)
+unsigned char *raw2mo5(unsigned char *input, int height, int fixup)
 {
   unsigned char *tmpBuffer;
@@ -26 +26 @@
 
   bool lfo = false;
-  for (y = 0; y < 200; y++)
+  for (y = 0; y < height; y++)
         for (x = 0; x < 320; x+=8) {
                 int fore = 255;
@@ -58 +58 @@
                 }
 
-                if (fore == 255) fore = 7;
+                if (fore == 255) fore = fixup;
                 if (fore != 255) {
                         previous &= 0xF;
@@ -71 +71 @@
                 // are both FORME or both FOND, else we get an ugly glitch on the
                 // EFGJ033 Gate Array MO5!
-                if(fixup && oldlfo == !(tmpBuffer[(y*320+x)/8] & 0x80))
+                if(fixup > 0 && oldlfo == !(tmpBuffer[(y*320+x)/8] & 0x80))
                 {
                         previous = (previous >> 4) | (previous << 4);

tools/gfx2mo5/libraw2mo5.h

@@ -10 +10 @@
 #define LIBRAW2mo5_H 1
 
-unsigned char * raw2mo5(unsigned char *input, bool fixup);
+unsigned char * raw2mo5(unsigned char *input, int height, int fixup);
 
 #endif

tools/gfx2mo5/png2mo5.c

@@ -127 +127 @@
   png_read_image(png_ptr, ptrRow);
 
-  outBuffer = raw2mo5(inBuffer, argc > 3);
+  outBuffer = raw2mo5(inBuffer, height, argc > 3 ? atoi(argv[3]):-1);
 
   int pxsize = width * height / 8;