X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=1602dd419d50089645f3df82f12912435444eae1;hb=52210ae670b22ce2d187bd2dc943fd8ae3f4a8c0;hp=853fef50639427c291de89444795393855bf7a98;hpb=4903e3f2fbd534bde1bc3ebc4d84328297e0b388;p=ypp-sc-tools.db-test.git

diff --git a/pctb/convert.h b/pctb/convert.h
index 853fef5..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,19 +14,25 @@
 /*----- 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 vprogress(const char *fmt, va_list);
-void progress(const char *fmt, ...);
+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_log(const char *fmt, va_list);
-void progress_log(const char *fmt, ...);
+void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
+void progress_spinner(const char *fmt, ...)      FMT(1,2);
 
 /*----- from pages.c -----*/