X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Focr.h;h=97a5c66997f16efa2abdf586979e21ffc5c9b1be;hp=60234a8e91e6028ea8f028a912f0a53d8eafbc7d;hb=b4e128efc860c4416fe913abe97b190404e866dd;hpb=0826bbc65e59d47c270f05af419f24fdfc3c349c

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 60234a8..97a5c66 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -2,35 +2,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
 
+#include "common.h"
 
-// #define DEBUG_RECTANGLES
-// #define DEBUG_OCR
-
-
-#define _GNU_SOURCE
-
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <inttypes.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-
-typedef struct {
-  int w,h;
-  char d[];
-} CanonImage;
 
 typedef uint32_t Pixcol;
 #define PSPIXCOL(priscan) priscan##32
@@ -45,6 +45,7 @@ typedef struct {
 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;
@@ -56,13 +57,10 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    */
 
 
-/*----- debugging arrangements, rather contingent -----*/
-
-void debug_flush(void);
+extern const char *o_resolver;
 
-#define eassert assert
-#define debug stderr
+FILE *resolve_start(void);
+void resolve_finish(void);
 
-const char *get_vardir(void);
 
 #endif /*OCR_H*/