X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=1602dd419d50089645f3df82f12912435444eae1;hb=aac1ada93b1c972e964f53c47dccd0fe4f8aff3a;hp=d532c2bc4a3e3b4c2829309d25f4a20386899b5b;hpb=0826bbc65e59d47c270f05af419f24fdfc3c349c;p=ypp-sc-tools.db-test.git

diff --git a/pctb/convert.h b/pctb/convert.h
index d532c2b..1602dd4 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -1,7 +1,7 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
-
+#include "common.h"
 #include "ocr.h"
 
 #include <pam.h>
@@ -14,14 +14,26 @@
 /*----- from structure.c -----*/
 
 void find_structure(CanonImage *im);
-CanonImage *file_read_image_ppm(FILE *f);
 void read_screenshots(void);
+void read_one_screenshot(void);
 void analyse(void);
 
 /*----- from convert.c -----*/
 
 extern FILE *screenshots_file;
 
+void vwarning(const char *fmt, va_list) FMT(1,0);
+void warning(const char *fmt, ...)      FMT(1,2);
+
+void vprogress(const char *fmt, va_list) FMT(1,0);
+void progress(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_log(const char *fmt, va_list) FMT(1,0);
+void progress_log(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
+void progress_spinner(const char *fmt, ...)      FMT(1,2);
+
 /*----- from pages.c -----*/
 
 void screenshot_startup(void);
@@ -34,5 +46,7 @@ void take_one_screenshot(void);
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;
 
+extern char *ocean, *pirate;
+
 
 #endif /*CONVERT_H*/