X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fconvert.h;h=d38c38efab83362a3ec7cb22e30dcc8539565cfb;hp=15ec06d1ad7ce4217418e2754ea487bc94fe7955;hb=df798e7f57fac305e26cf1cf6265160ac5219d72;hpb=f2c5d45ada202f2ad2640b260cac2fd7bb83eb3e

diff --git a/pctb/convert.h b/pctb/convert.h
index 15ec06d..d38c38e 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -38,16 +38,39 @@
 #include <sys/time.h>
 
 
+/*----- from rgbimage.c -----*/
+
+#define MAXIMGIDENT 100
+
+typedef struct RgbImage {
+  int w, h;
+  unsigned char data[];
+  /* red   = data[ y*w*3 + x*3 + 0 ] = RI_PIXEL(ri,x,y)[0]
+   * green = data[ y*w*3 + x*3 + 1 ] = RI_PIXEL(ri,x,y)[1]
+   * blue  = data[ y*w*3 + x*3 + 2 ] = RI_PIXEL(ri,x,y)[2]
+   */
+} RgbImage;
+
+void identify_rgbimage(const RgbImage *base, Rect portion,
+		       char result[MAXIMGIDENT], const char *what);
+RgbImage *alloc_rgb_image(int w, int h);
+
+#define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
+
 /*----- from structure.c -----*/
 
-void find_structure(CanonImage *im);
+void find_structure(const CanonImage *im, int *max_relevant_y_r);
+
+void find_islandname(void);
+void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
-void analyse(void);
+void analyse(FILE *tsv_output);
 
 /*----- from convert.c -----*/
 
-extern FILE *screenshots_file;
+extern FILE *screenshot_file;
+extern void fetch_with_rsync(const char *stem);
 
 void vwarning(const char *fmt, va_list) FMT(1,0);
 void warning(const char *fmt, ...)      FMT(1,2);
@@ -61,6 +84,27 @@ 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);
 
+enum flags {
+  ff_editcharset=     00001,
+  ff_singlepage=      00002,
+  ff_testservers=     00004,
+  
+  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,
+};
+extern enum flags o_flags;
+
+extern const char *o_ocean, *o_pirate;
+extern int o_quiet;
+
 /*----- from pages.c -----*/
 
 void screenshot_startup(void);
@@ -72,8 +116,10 @@ void take_one_screenshot(void);
 #define MAX_PAGES 100
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;
+RgbImage *page0_rgbimage;
 
-extern char *ocean, *pirate;
+extern const char *ocean, *pirate;
+extern char *archipelago, *island;
 
 
 #endif /*CONVERT_H*/