make --edit-charset required again

[ypp-sc-tools.main.git] / pctb / convert.h

diff --git a/pctb/convert.h b/pctb/convert.h
index 354a6f12467b10755a8eddc02513496dea54eb45..80979ec2e885829f8d15faccd887c9c63a6812b0 100644 (file)
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -54,14 +54,16 @@ typedef struct RgbImage {
 void identify_rgbimage(const RgbImage *base, Rect portion,
                       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)
 
 /*----- from structure.c -----*/
 
 void find_structure(const 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);
@@ -87,6 +89,7 @@ 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,
@@ -94,11 +97,16 @@ enum flags {
   ffs_dict=           00070,
 
   ff_needisland=      00100,
-  ff_upload=          00200,
-  ffs_upload=         00300,
+  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);
@@ -112,7 +120,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*/