X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=07c3a6ffaf366759da1e8fbf9bf5dd2e7b6271ce;hb=2c3d2e7de4d4aea3536ea79ced23677e24589833;hp=47fdee62bb333bbc22f38cf2c25407dc2797bcea;hpb=74e4e249f2c3e848592984cb193aded6a77a341d;p=ypp-sc-tools.db-test.git

diff --git a/pctb/convert.h b/pctb/convert.h
index 47fdee6..07c3a6f 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -44,24 +44,35 @@
 
 typedef struct RgbImage {
   int w, h;
-  char data[];
+  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;
 
+typedef unsigned long Rgb;
+
 void identify_rgbimage(const RgbImage *base, Rect portion,
-		       char result[MAXIMGIDENT]);
+		       char result[MAXIMGIDENT], const char *what);
 RgbImage *alloc_rgb_image(int w, int h);
+void fwrite_ppmraw(FILE *f, const RgbImage *ri);
 
 #define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
 
+static inline Rgb ri_rgb(const RgbImage *ri, int x, int y) {
+  const unsigned char *rip= RI_PIXEL(ri,x,y);
+  return (rip[0] << 16) |
+         (rip[1] <<  8) |
+         (rip[2]      );
+}
+
 /*----- from structure.c -----*/
 
-void find_structure(const CanonImage *im, int *max_relevant_y_r);
+void find_structure(CanonImage *im, int *max_relevant_y_r);
+Rect find_sunshine_widget(void);
 
-void find_islandname(void);
+void find_islandname(RgbImage *ri);
 void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
@@ -70,6 +81,7 @@ void analyse(FILE *tsv_output);
 /*----- from convert.c -----*/
 
 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);
@@ -83,6 +95,31 @@ 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_singlepage=          000002,
+  ff_testservers=         000004,
+
+  ff_charset_edit=        000010,
+  ff_charset_allowedit=   000020,
+  ff_charset_havelocal=   000040,
+  ffm_charset=            000070,
+  
+  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;
+
+extern const char *o_ocean, *o_pirate;
+extern int o_quiet;
+
 /*----- from pages.c -----*/
 
 void screenshot_startup(void);
@@ -94,9 +131,9 @@ 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*/