X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=0ab09dbccb7ac56b2076cb870d9956f701af6f09;hb=579edbc3e615ade4ac65296eeaff383ac19fe9b1;hp=827c6a7cc341992fba84403db013b175d6eaf67e;hpb=3d80a86a8c77e29a26e70aa810ebb2dea607208e;p=ypp-sc-tools.web-live.git

diff --git a/pctb/convert.h b/pctb/convert.h
index 827c6a7..0ab09db 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -51,17 +51,28 @@ typedef struct RgbImage {
    */
 } RgbImage;
 
+typedef unsigned long Rgb;
+
 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)
 
+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);
@@ -87,6 +98,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,
@@ -115,7 +127,6 @@ void take_one_screenshot(void);
 #define MAX_PAGES 100
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;
-RgbImage *page0_rgbimage;
 
 extern const char *ocean, *pirate;
 extern char *archipelago, *island;