Changeset cc8f3af in thomson

Timestamp:

Mar 19, 2012, 7:46:08 AM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

7cabd49

Parents:

e18627d

Message:

GFX2MO5

• Allow picture to be less high than the screen and don't write the useless bytes
• Don't set execution address to 3000, this makes no sense. Set it to 0, which makes no sense either.

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

File:

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

tools/gfx2mo5/png2mo5.c

@@ -42 +42 @@
 
   // End marker block : type=255, size and address=0
-  const unsigned char end[]={255,0,0,0x30,0};
+  const unsigned char end[]={255,0,0,0,0};
 
   if(argc != 3) 
@@ -129 +129 @@
   outBuffer = raw2mo5(inBuffer);
 
+  int pxsize = width * height / 8;
+  thomheader[7] = pxsize >> 8;
+  thomheader[8] = pxsize;
+
   outFile = fopen(argv[2], "wb");
   fwrite(thomheader, 1, sizeof(thomheader), outFile);
   //write forme data
-  fwrite(outBuffer, 1, 0x1F40, outFile);
+  fwrite(outBuffer, 1, pxsize, outFile);
   thomheader[5] = 0x50;
   fwrite(thomheader, 1, sizeof(thomheader), outFile);
   // write color data
-  fwrite(outBuffer+0x2000, 1, 0x1f40, outFile);
+  fwrite(outBuffer+0x2000, 1, pxsize, outFile);
   fwrite(end, 1, sizeof(end), outFile);