Some of these interface comments are out of date

[ypp-sc-tools.db-test.git] / pctb / ocr.h

diff --git a/pctb/ocr.h b/pctb/ocr.h
index 5b5f697dbd88603a37dd8f518f91308c39192dfb..df6aaf8fefd579b2a3399a5fbb697e725895a055 100644 (file)
--- a/pctb/ocr.h
+++ b/pctb/ocr.h
@@ -2,12 +2,34 @@
  * 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 _GNU_SOURCE
+#include "common.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -16,18 +38,11 @@
 #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 +56,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;
@@ -52,46 +68,4 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType, int w, Pixcol cols[]);
    */
 
 
-/*----- debugging arrangements, rather contingent -----*/
-
-#define DEBUG_FLAG_LIST                                \
-   DF(findypp)                                 \
-   DF(pages)                                   \
-   DF(rect)                                    \
-   DF(ocr)                                     \
-   DF(callout)
-
-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_SOME_DEBUGF(fl,funcf)                             \
-  static void v##funcf(const char *fmt, va_list al) {                  \
-    if (DEBUGP(fl))                                                    \
-      vfprintf(debug,fmt,al);                                          \
-  }                                                                    \
-  static void funcf(const char *fmt, ...) {                            \
-    va_list al;  va_start(al,fmt);  v##funcf(fmt,al);  va_end(al);     \
-  }
-
-#define DEBUG_DEFINE_DEBUGF(fl) DEBUG_DEFINE_SOME_DEBUGF(fl,debugf)
-
 #endif /*OCR_H*/