X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fstructure.h;h=77396cf390db06ade4c30f7279b0105aa42377c7;hp=10de443ed6e55169520bea1d7e4e57fd3610bb05;hb=c70c2c7701a7777524881f3f88ab2db2851f932a;hpb=0826bbc65e59d47c270f05af419f24fdfc3c349c

diff --git a/pctb/structure.h b/pctb/structure.h
index 10de443..77396cf 100644
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -1,3 +1,31 @@
+/*
+ * Image canonicalisation function for use by callers feeding
+ *  images into structure.c's routines.
+ */
+/*
+ *  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 STRUCTURE_H
 #define STRUCTURE_H
 
@@ -14,16 +42,6 @@ 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);			\
-      int 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
-
 #define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{		\
     /* compute_rgb should be a number of statements, or		\
      * a block, which assigns to				\
@@ -42,16 +60,42 @@ CanonImage *alloc_canon_image(int w, int h);
         const CanonColourInfo *cci;				\
         unsigned long rgb;					\
 	COMPUTE_RGB;						\
-	for (cci=canoncolourinfos; cci->c; cci++)		\
+	for (cci=canoncolourinfos; cci->c; cci++) {		\
 	  if (cci->rgb == rgb) {				\
 	    (im)->d[y*(w) + x]= cci->c;				\
 	    break;						\
 	  }							\
+	}							\
+      }								\
+      if (DEBUGP(rect)) {					\
+	fprintf(debug, "%4d ",y);				\
+	fwrite(im->d + y*w, 1,w, debug);			\
+	fputc('\n',debug);					\
       }								\
-      CANIMG_DEBUG_RECTANGLE_1LINE((im),(w),(h))		\
     }								\
     debug_flush();						\
   }while(0)
 
 
+typedef struct {
+  int w, h;
+  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]
+   */
+} RawImage;
+
+RawImage *alloc_raw_image(int w, int h);
+
+#define RI_PIXEL(ri,x,y) ((ri)->data + ((y)*(ri)->w + (x)) * 3)
+
+#define CANONIMG_ALSO_STORERAW(ri)		\
+  do{						\
+    char *rip= RI_PIXEL((ri),x,y);		\
+    rip[0]= rgb >> 16;				\
+    rip[1]= rgb >> 8;				\
+    rip[2]= rgb;				\
+  }while(0)
+
 #endif /*STRUCTURE_H*/