X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=47fdee62bb333bbc22f38cf2c25407dc2797bcea;hb=74e4e249f2c3e848592984cb193aded6a77a341d;hp=e9d00b97de35b8c9cdc4005dfe8351bd766fa01d;hpb=ae5d4e36af4f4a5567e1231958179d3a50eb4466;p=ypp-sc-tools.db-test.git

diff --git a/pctb/convert.h b/pctb/convert.h
index e9d00b9..47fdee6 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -38,9 +38,31 @@
 #include <sys/time.h>
 
 
+/*----- from rgbimage.c -----*/
+
+#define MAXIMGIDENT 100
+
+typedef struct RgbImage {
+  int w, h;
+  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]
+   */
+} RgbImage;
+
+void identify_rgbimage(const RgbImage *base, Rect portion,
+		       char result[MAXIMGIDENT]);
+RgbImage *alloc_rgb_image(int w, int h);
+
+#define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
+
 /*----- from structure.c -----*/
 
-void find_structure(CanonImage *im);
+void find_structure(const CanonImage *im, int *max_relevant_y_r);
+
+void find_islandname(void);
+void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
 void analyse(FILE *tsv_output);
@@ -72,6 +94,7 @@ void take_one_screenshot(void);
 #define MAX_PAGES 100
 extern CanonImage *page_images[MAX_PAGES];
 extern int npages;
+RgbImage *page0_rgbimage;
 
 extern char *ocean, *pirate;