chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cope with JSON.pm version 2 which has an incompatible change
[ypp-sc-tools.db-live.git]
/
pctb
/
convert.h
diff --git
a/pctb/convert.h
b/pctb/convert.h
index 354a6f12467b10755a8eddc02513496dea54eb45..6601b77386c20a8fa3a5c1f23db7e69179735887 100644
(file)
--- a/
pctb/convert.h
+++ b/
pctb/convert.h
@@
-51,17
+51,29
@@
typedef struct RgbImage {
*/
} 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 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)
#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 -----*/
/*----- 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 canon_colour_prepare(void);
+void find_islandname(RgbImage *ri);
void check_correct_commodities(void);
void read_screenshots(void);
void read_one_screenshot(void);
void check_correct_commodities(void);
void read_screenshots(void);
void read_one_screenshot(void);
@@
-85,20
+97,30
@@
void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
void progress_spinner(const char *fmt, ...) FMT(1,2);
enum flags {
void progress_spinner(const char *fmt, ...) FMT(1,2);
enum flags {
- ff_editcharset= 00001,
- ff_singlepage= 00002,
+ 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_upload= 00200,
- ffs_upload= 00300,
+ 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;
};
extern enum flags o_flags;
+extern const char *o_ocean, *o_pirate;
+extern int o_quiet;
+
/*----- from pages.c -----*/
void screenshot_startup(void);
/*----- from pages.c -----*/
void screenshot_startup(void);
@@
-107,12
+129,12
@@
void find_yppclient_window(void);
void take_screenshots(void);
void take_one_screenshot(void);
void take_screenshots(void);
void take_one_screenshot(void);
-#define MAX_PAGES 100
+#define MAX_PAGES 100
0
extern CanonImage *page_images[MAX_PAGES];
extern int npages;
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*/
#endif /*CONVERT_H*/