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=827c6a7cc341992fba84403db013b175d6eaf67e;hp=47fdee62bb333bbc22f38cf2c25407dc2797bcea;hb=3d80a86a8c77e29a26e70aa810ebb2dea607208e;hpb=74e4e249f2c3e848592984cb193aded6a77a341d

diff --git a/pctb/convert.h b/pctb/convert.h
index 47fdee6..827c6a7 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -44,7 +44,7 @@
 
 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]
@@ -52,7 +52,7 @@ typedef struct RgbImage {
 } RgbImage;
 
 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);
 
 #define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
@@ -70,6 +70,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 +84,26 @@ 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_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);
@@ -96,7 +117,8 @@ 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*/