X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=0dc2255ddaea9c9a1cc214e04c3487c5255a145a;hb=60cd4954d1d3c11c46251f68e2d56f24661a6d67;hp=b61563fd32449c200b6915484b4fcc9a3d3c7a33;hpb=cec9583fe97a74a44625e63cfa22318db2699ee4;p=ypp-sc-tools.web-live.git

diff --git a/pctb/convert.h b/pctb/convert.h
index b61563f..0dc2255 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -69,10 +69,14 @@ static inline Rgb ri_rgb(const RgbImage *ri, int x, int y) {
 
 /*----- from structure.c -----*/
 
-void find_structure(const CanonImage *im, int *max_relevant_y_r);
+void find_structure(CanonImage *im, int *max_relevant_y_r,
+		    Point *commod_focus_point_r,
+		    Point *commod_page_point_r,
+		    Point *commod_focuslast_point_r);
 Rect find_sunshine_widget(void);
 
-void find_islandname(RgbImage *ri);
+void canon_colour_prepare(void);
+void find_islandname(void);
 void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
@@ -81,7 +85,8 @@ void analyse(FILE *tsv_output);
 /*----- from convert.c -----*/
 
 extern FILE *screenshot_file;
-extern void fetch_with_rsync(const char *stem);
+void fetch_with_rsync(const char *stem);
+void fetch_with_rsync_gz(const char *stem);
 
 void vwarning(const char *fmt, va_list) FMT(1,0);
 void warning(const char *fmt, ...)      FMT(1,2);
@@ -96,20 +101,24 @@ void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
 void progress_spinner(const char *fmt, ...)      FMT(1,2);
 
 enum flags {
-  ff_editcharset=     00001,
-  ff_singlepage=      00002,
-  ff_testservers=     00004,
+  ff_singlepage=          000002,
+  ff_testservers=         000004,
+
+  ff_charset_edit=        000010,
+  ff_charset_allowedit=   000020,
+  ff_charset_havelocal=   000040,
+  ffm_charset=            000070,
   
-  ff_dict_fetch=      00010,
-  ff_dict_submit=     00020,
-  ff_dict_pirate=     00040,
-  ffs_dict=           00070,
-
-  ff_needisland=      00100,
-  ff_printisland=     00200,
-  ff_upload=          00400,
-  ffs_printisland=    00300,
-  ffs_upload=         00500,
+  ff_dict_fetch=          000100,
+  ff_dict_submit=         000200,
+  ff_dict_pirate=         000400,
+  ffs_dict=               000700,
+
+  ff_needisland=          001000,
+  ff_printisland=         002000,
+  ff_upload=              004000,
+  ffs_printisland=        003000,
+  ffs_upload=             005000,
 };
 extern enum flags o_flags;
 
@@ -124,7 +133,7 @@ void find_yppclient_window(void);
 void take_screenshots(void);
 void take_one_screenshot(void);
 
-#define MAX_PAGES 100
+#define MAX_PAGES 1000
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;