X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Fconvert.h;h=ba13c433f3e4340d02b8b0c0522551587750481a;hp=83be1e8bced1ab8fce05d7233588595792f74530;hb=5f9478a284c640fde807ee4a1e18cae8438dca52;hpb=9334b48a221df6f96a88933be8fde35e2ef41b35

diff --git a/pctb/convert.h b/pctb/convert.h
index 83be1e8..ba13c43 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -51,6 +51,8 @@ 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);
@@ -58,12 +60,20 @@ 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(RgbImage *ri);
+void canon_colour_prepare(void);
+void find_islandname(void);
 void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
@@ -87,20 +97,24 @@ 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_singlepage=          000002,
+  ff_testservers=         000004,
+
+  ff_charset_edit=        000010,
+  ff_charset_allowedit=   000020,
+  ff_charset_havelocal=   000040,
+  ffm_charset=            000070,
   
-  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,
+  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;
 
@@ -115,7 +129,7 @@ void find_yppclient_window(void);
 void take_screenshots(void);
 void take_one_screenshot(void);
 
-#define MAX_PAGES 100
+#define MAX_PAGES 1000
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;