Changeset 15d3e8a in thomson for tools/gfx2mo5/png2mo5.c

Timestamp:

Mar 20, 2016, 10:04:25 PM (8 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

a8929a8

Parents:

2366419

Message:

gfx2mo5: can now convert bitmap16 files.

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

File:

• tools/gfx2mo5/png2mo5.c (modified) (5 diffs)

tools/gfx2mo5/png2mo5.c

@@ -39 +39 @@
 
   char opt;
-  int fixup = -1;
-  bool to = false;
+  int fixup;
+  bool to;
+  bool bitmap16;
 
   unsigned char thomheader[] = {
@@ -51 +52 @@
 
   // End marker block : type=255, size and address=0
-  const unsigned char end[]={255,0,0,0,0};
+  static const unsigned char end[]={255,0,0,0,0};
 
   if(argc < 3) 
   {
     printf("Utilisation : %s [options] input_filename output_filename\n",argv[0]);
+        printf("Option -m s: Mode to use (bm16/40c)\n");
         printf("Option -t: use TO transcoding.\n");
         printf("Option -f n: use modified algorithm to avoid artifacts on some MO5 gate array versions. n is the index of the background color.\n");
@@ -61 +63 @@
   }
 
-  while((opt = getopt(argc, argv, "tf:")) != -1) {
+  fixup = -1;
+  to = false;
+  bitmap16 = false;
+
+  while((opt = getopt(argc, argv, "tf:m:")) != -1) {
     switch(opt) {
       case 't':
@@ -73 +79 @@
                   fixup = atoi(optarg);
                   break;
+          case 'm':
+                  if (strcmp(optarg, "bm16") == 0)
+                          bitmap16 = true;
         }
   }
@@ -153 +162 @@
   png_read_image(png_ptr, ptrRow);
 
-  outBuffer = raw2mo5(inBuffer, height, fixup, to);
-
-  pxsize = width * height / 8;
+  if (bitmap16) {
+        if (width != 160) {
+                puts("Image not using the full screen width are not supported yet!");
+                return ERROR;
+        }
+        outBuffer = raw2bm16(inBuffer, height);
+        pxsize = width * height / 4;
+  } else {
+        if (width != 320) {
+                puts("Image not using the full screen width are not supported yet!");
+                return ERROR;
+        }
+        outBuffer = raw2mo5(inBuffer, height, fixup, to);
+        pxsize = width * height / 8;
+  }
+
   thomheader[7] = pxsize >> 8;
   thomheader[8] = pxsize;