X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Fconvert.h;h=90e5e243acc737c580c284063a881636d2b8d5a1;hp=853fef50639427c291de89444795393855bf7a98;hb=0f15b620cf06ccb231c388746dda99f87252f9d0;hpb=4903e3f2fbd534bde1bc3ebc4d84328297e0b388

diff --git a/pctb/convert.h b/pctb/convert.h
index 853fef5..90e5e24 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -1,7 +1,34 @@
+/*
+ * general header file for ypp-commodities
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
+
 #ifndef CONVERT_H
 #define CONVERT_H
 
-
+#include "common.h"
 #include "ocr.h"
 
 #include <pam.h>
@@ -14,19 +41,25 @@
 /*----- from structure.c -----*/
 
 void find_structure(CanonImage *im);
-CanonImage *file_read_image_ppm(FILE *f);
 void read_screenshots(void);
-void analyse(void);
+void read_one_screenshot(void);
+void analyse(FILE *tsv_output);
 
 /*----- 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 -----*/