Changeset 732c820 in thomson

Timestamp:

Mar 4, 2013, 10:24:01 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

3b64f76

Parents:

b9b1bde

Message:

Allow to use the glitched mode, sometimes it's useful.

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

Location:

tools/gfx2mo5

Files:

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

tools/gfx2mo5/libraw2mo5.c

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

tools/gfx2mo5/libraw2mo5.h

@@ -2 +2 @@
  * CloudStrife - 20080921
  * Diffusé sous licence libre CeCILL v2
- * Voire LICENCE
+ * Voir LICENCE
  */
+
+#include <stdbool.h>
 
 #ifndef LIBRAW2mo5_H
 #define LIBRAW2mo5_H 1
 
-unsigned char * raw2mo5(unsigned char *input);
+unsigned char * raw2mo5(unsigned char *input, bool fixup);
 
 #endif

tools/gfx2mo5/png2mo5.c

@@ -44 +44 @@
   const unsigned char end[]={255,0,0,0,0};
 
-  if(argc != 3) 
+  if(argc < 3) 
   {
-    printf("Utilisation : %s input_filename output_filename\n",argv[0]);
+    printf("Utilisation : %s input_filename output_filename options\n",argv[0]);
     exit(0);
   }
@@ -127 +127 @@
   png_read_image(png_ptr, ptrRow);
 
-  outBuffer = raw2mo5(inBuffer);
+  outBuffer = raw2mo5(inBuffer, argc > 3);
 
   int pxsize = width * height / 8;