--- psiconv/trunk/lib/psiconv/data.h	1999/10/03 21:10:47	2
+++ psiconv/trunk/lib/psiconv/data.h	1999/10/11 16:15:14	12
@@ -34,7 +34,7 @@
   psiconv_unknown_file,
   psiconv_word_file,
   psiconv_texted_file,
-  psiconv_mfm_file,
+  psiconv_mbm_file,
   psiconv_sketch_file
 } psiconv_file_type_t;
   
@@ -316,6 +316,25 @@
   psiconv_texted_section texted_sec;
 } *psiconv_texted_f;
 
+typedef psiconv_list psiconv_mbm_jumptable_section; /* of psiconv_u32 */
+
+/* Normalized values [0..1] for each component 
+   Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */
+typedef struct psiconv_paint_data_section {
+  psiconv_u32 xsize;
+  psiconv_u32 ysize;
+  float *red;
+  float *green;
+  float *blue;
+} *psiconv_paint_data_section;
+
+typedef psiconv_list psiconv_pictures; 
+            /* of struct psiconv_paint_data_section */
+
+typedef struct psiconv_mbm_f {
+  psiconv_pictures sections;
+} *psiconv_mbm_f;
+
 typedef struct psiconv_file {
   psiconv_file_type_t type;
   void *file;
@@ -326,6 +345,7 @@
 #define PSICONV_ID_PSION5 0x10000037
 /* UID2 */
 #define PSICONV_ID_DATA_FILE 0x1000006D
+#define PSICONV_ID_MBM_FILE 0x10000042
 /* UID3 */
 #define PSICONV_ID_WORD 0x1000007F
 #define PSICONV_ID_TEXTED 0x10000085
@@ -397,6 +417,12 @@
 extern void psiconv_free_word_status_section
                                       (psiconv_word_status_section section);
 extern void psiconv_free_word_f(psiconv_word_f file);
+extern void psiconv_free_texted_f(psiconv_texted_f file);
+extern void psiconv_free_paint_data_section(psiconv_paint_data_section section);
+extern void psiconv_free_pictures(psiconv_pictures section);
+extern void psiconv_free_mbm_jumptable_section
+                                       (psiconv_mbm_jumptable_section section);
+extern void psiconv_free_mbm_f(psiconv_mbm_f file);
 extern void psiconv_free_file(psiconv_file file);