X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fconvert.h;h=b5e9230ec1efb485c2d9d3b0369532f4ccc49a75;hp=1602dd419d50089645f3df82f12912435444eae1;hb=27ae0b4c6d571104f553d5bf863998fd478feb45;hpb=52210ae670b22ce2d187bd2dc943fd8ae3f4a8c0

diff --git a/pctb/convert.h b/pctb/convert.h
index 1602dd4..b5e9230 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -1,3 +1,30 @@
+/*
+ * general header file for ypp-commodities
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
+
 #ifndef CONVERT_H
 #define CONVERT_H
 
@@ -11,16 +38,38 @@
 #include <sys/time.h>
 
 
+/*----- from rgbimage.c -----*/
+
+#define MAXIMGIDENT 100
+
+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]
+   */
+} RgbImage;
+
+void identify_rgbimage(const RgbImage *base, Rect portion,
+		       char result[MAXIMGIDENT], const char *what);
+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(void);
+void analyse(FILE *tsv_output);
 
 /*----- from convert.c -----*/
 
-extern FILE *screenshots_file;
+extern FILE *screenshot_file;
 
 void vwarning(const char *fmt, va_list) FMT(1,0);
 void warning(const char *fmt, ...)      FMT(1,2);
@@ -45,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;