#define MAXIMGIDENT 100
+typedef uint32_t Rgb; /* red<<0 | green<<8 | blue<<16 */
+
typedef struct RgbImage {
int w, h;
- 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]
- */
+ Rgb data[]; /* data[ y*w + x ] */
} RgbImage;
void identify_rgbimage(const RgbImage *base, Rect portion,
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)
+#define RI_PIXEL32(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)))
+
+static inline Rgb ri_rgb(const RgbImage *ri, int x, int y) {
+ return *RI_PIXEL32(ri,x,y);
+}
/*----- from structure.c -----*/
-void find_structure(const CanonImage *im, int *max_relevant_y_r);
+typedef struct PageStruct PageStruct;
+
+void find_structure(const CanonImage *im,
+ PageStruct **pagestruct_r, /* caller must free() */
+ int *max_relevant_y_r,
+ Point *commod_focus_point_r,
+ Point *commod_page_point_r,
+ Point *commod_focuslast_point_r);
+void store_current_page(CanonImage *ci /*pointer saved*/,
+ PageStruct *pagestruct, /*freed*/
+ RgbImage *rgb /*freed*/);
+void adjust_colours(CanonImage *ci, const RgbImage *rgb);
+
+void select_page(int page);
+
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);
/*----- from convert.c -----*/
extern FILE *screenshot_file;
-extern void fetch_with_rsync(const char *stem);
+void fetch_with_rsync(const char *stem);
+void fetch_with_rsync_gz(const char *stem);
void vwarning(const char *fmt, va_list) FMT(1,0);
void warning(const char *fmt, ...) FMT(1,2);
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;
+enum mode {
+ mf_findwindow= 00001,
+ mf_screenshot= 00010,
+ mf_readscreenshot= 00020,
+ mf_analyse= 00100,
+ mfm_special= 07000,
+
+ mode_findwindow= 00001,
+ mode_screenshot= 00011,
+ mode_analyse= 00120,
+ mode_showcharset= 01000,
+
+ mode_all= 00111,
+};
+extern enum mode o_mode;
+
extern const char *o_ocean, *o_pirate;
extern int o_quiet;
void take_screenshots(void);
void take_one_screenshot(void);
-#define MAX_PAGES 100
-extern CanonImage *page_images[MAX_PAGES];
+#define MAX_PAGES 1000
+
+extern const CanonImage *page_images[MAX_PAGES];
+extern const RgbImage *page0_rgbimage;
extern int npages;
-RgbImage *page0_rgbimage;
extern const char *ocean, *pirate;
extern char *archipelago, *island;