X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=pctb%2Focr.h;h=97a5c66997f16efa2abdf586979e21ffc5c9b1be;hp=792110466f4dfe05cde96b469697321ea56b1f1d;hb=8fc3ec638c7e516f4610775488f2e7f40689a68f;hpb=5d58a08423953756871493042a9cfff032b66e18

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 7921104..97a5c66 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -1,34 +1,35 @@
+/*
+ * ocr.c forms a mostly-self-contained bit
+ * so we put its declarations in this separate file
+ */
+/*
+ *  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 OCR_H
 #define OCR_H
 
-
-#define DEBUG_RECTANGLES
-// #define DEBUG_OCR
-
-
-
-#define _GNU_SOURCE
-
-#include <pam.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-#include <limits.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-
-
-typedef struct {
-  int w,h;
-  char d[];
-} CanonImage;
+#include "common.h"
 
 
 typedef uint32_t Pixcol;
@@ -40,9 +41,12 @@ typedef struct {
   unsigned ctxmap; /* match context index */
 } OcrResultGlyph;
 
+
 typedef const struct OcrCellTypeInfo *OcrCellType;
 extern const struct OcrCellTypeInfo ocr_celltype_text;
 extern const struct OcrCellTypeInfo ocr_celltype_number;
+const char *ocr_celltype_name(OcrCellType ct);
+
 
 typedef struct OcrReader OcrReader;
 OcrReader *ocr_init(int h);
@@ -52,66 +56,11 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    * array is valid until next call to ocr()
    */
 
-void debug_flush(void);
-
-#define eassert assert
-#define debug stdout
-
-const char *get_vardir(void);
-
-CanonImage *file_read_image(FILE *f);
-int main_test(void);
-
-#define MAX_PAGES 100
-extern CanonImage *page_images[MAX_PAGES];
-extern int npages;
-
-
-typedef struct {
-  unsigned long rgb; /* on screen */
-  char c; /* canonical */
-} CanonColourInfo;
-
-extern const CanonColourInfo canoncolourinfos[];
-
-CanonImage *alloc_canon_image(int w, int h);
 
-#ifdef DEBUG_RECTANGLES
-# define CANIMG_DEBUG_RECTANGLE_1LINE(im,w,h)	\
-      fprintf(debug, "%4d ",y);			\
-      r= fwrite(im->d + y*w, 1,w, debug);	\
-      eassert(r==w);				\
-      fputc('\n',debug);
-#else
-# define CANIMG_DEBUG_RECTANGLE_1LINE(im,y,h) /* nothing */
-#endif
+extern const char *o_resolver;
 
-#define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{		\
-    /* compute_rgb should be a number of statements, or		\
-     * a block, which assigns to				\
-     *   unsigned long rgb;					\
-     * given the values of					\
-     *   int x,y;						\
-     * all of which are anamorphic.  Result is stored in im.	\
-     */								\
-    (im)= alloc_canon_image((w), (h));				\
-								\
-    int x,y,r;							\
-    for (y=0; y<(h); y++) {					\
-      for (x=0; x<(w); x++) {					\
-        const CanonColourInfo *cci;				\
-        unsigned long rgb;					\
-	COMPUTE_RGB;						\
-	for (cci=canoncolourinfos; cci->c; cci++)		\
-	  if (cci->rgb == rgb) {				\
-	    (im)->d[y*(w) + x]= cci->c;				\
-	    break;						\
-	  }							\
-      }								\
-      CANIMG_DEBUG_RECTANGLE_1LINE((im),(w),(h))		\
-    }								\
-    debug_flush();						\
-  }while(0)
+FILE *resolve_start(void);
+void resolve_finish(void);
 
 
 #endif /*OCR_H*/