X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=pctb%2Focr.h;h=943c2105c51189337e1eda759073a0213f3e3f48;hp=e8b5b1a1207dc3f5ebae2060718d7c0a96cba5b3;hb=8360f12a6a457b73ebb18dbeedbb15e6ed91318b;hpb=40e9c021a64bf3ab2fc56629d0e7530b53b56562

diff --git a/pctb/ocr.h b/pctb/ocr.h
index e8b5b1a..943c210 100644
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -2,31 +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 _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
@@ -41,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;
@@ -51,44 +56,7 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    * array is valid until next call to ocr()
    */
 
+extern const char *o_resolver;
 
-/*----- debugging arrangements, rather contingent -----*/
-
-#define DEBUG_FLAG_LIST				\
-   DF(ocr)					\
-   DF(rect)					\
-   DF(callout)					\
-   DF(pages)
-
-enum {
-#define DF(f) dbg__shift_##f,
-  DEBUG_FLAG_LIST
-#undef DF
-};
-enum {
-#define DF(f) dbg_##f = 1 << dbg__shift_##f,
-  DEBUG_FLAG_LIST
-#undef DF
-};
-
-unsigned debug_flags;
-
-#define DEBUGP(f) (!!(debug_flags & dbg_##f))
-
-void debug_flush(void);
-
-#define eassert assert
-#define debug stderr
-
-const char *get_vardir(void);
-
-#define DEBUG_DEFINE_DEBUGF(f)						\
-  static void vdebugf(const char *fmt, va_list al) {			\
-    if (DEBUGP(f))							\
-      vfprintf(debug,fmt,al);						\
-  }									\
-  static void debugf(const char *fmt, ...) {				\
-    va_list al;  va_start(al,fmt);  vdebugf(fmt,al);  va_end(al);	\
-  }
 
 #endif /*OCR_H*/