more horizontal refactoring

[swftools.git] / lib / gfxpoly / xrow.c

diff --git a/lib/gfxpoly/xrow.c b/lib/gfxpoly/xrow.c
index 123e00c..7987ac1 100644 (file)
--- a/lib/gfxpoly/xrow.c
+++ b/lib/gfxpoly/xrow.c
@@ -1,5 +1,9 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
 #include "../mem.h"
 #include "xrow.h"
+#include "poly.h"
 
 xrow_t* xrow_new()
 {
@@ -11,6 +15,9 @@ xrow_t* xrow_new()
 
 void xrow_add(xrow_t*r, int32_t x)
 {
+    if(r->num && r->lastx==x)
+        return;
+    r->lastx = x;
     if(r->num >= r->size) {
         r->size *= 2;
         r->x = rfx_realloc(r->x, sizeof(r->x[0])*r->size);
@@ -22,7 +29,7 @@ int compare_int32(const void*_i1,const void*_i2)
 {
     int32_t*i1 = (int32_t*)_i1;
     int32_t*i2 = (int32_t*)_i2;
-    return i1-i2;
+    return *i1-*i2;
 }
 
 void xrow_sort(xrow_t*r)
@@ -41,11 +48,50 @@ void xrow_sort(xrow_t*r)
     r->num = pos;
 }
 
+int xrow_find(xrow_t*r, int32_t x)
+{
+    int min, max, i, l;
+
+    for(min=0, max=r->num, i=r->num/2, l=r->num; i != l; l=i, i=(min+max)/2) {
+        if(x < r->x[i]) max=i;
+        else min=i;
+    }
+
+#ifdef CHECKS
+    int t;
+    for(t=0;t<r->num;t++) {
+       if(x < r->x[t]) 
+           break;
+    }
+    assert(max == t);
+#endif
+
+    return max;
+}
+
+char xrow_contains(xrow_t*r, int32_t x)
+{
+    int pos = xrow_find(r,x) - 1;
+    return (pos>=0 && r->x[pos]==x);
+}
+
 void xrow_reset(xrow_t*r)
 {
     r->num = 0;
 }
 
+void xrow_dump(xrow_t*xrow, double gridsize)
+{
+    fprintf(stderr, "x: ");
+    int t;
+    for(t=0;t<xrow->num;t++) {
+        if(t)
+            fprintf(stderr, ", ");
+        fprintf(stderr, "%.2f", xrow->x[t] * gridsize);
+    }
+    fprintf(stderr, "\n");
+}
+
 void xrow_destroy(xrow_t*r)
 {
     if(r->x) {