From: Emden R. Gansner <erg@alum.mit.edu>
Date: Thu, 23 Oct 2014 14:17:03 +0000 (-0400)
Subject: Replace cut and paste of colxlate.c in actions.c with simple #include.
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=264f8ed4453e24fbcc1240535d3c01b938eb1f99;p=graphviz

Replace cut and paste of colxlate.c in actions.c with simple #include.
This at least means there is a single source copy.
---

diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
index f0ba9232c..47cbb23d9 100644
--- a/lib/gvpr/actions.c
+++ b/lib/gvpr/actions.c
@@ -812,474 +812,18 @@ char *canon(Expr_t * pgm, char *arg)
     return p;
 }
 
-#include <stdlib.h>
-#ifdef WIN32
-#include "compat.h"
-#endif
-
-#include "arith.h"
-#include "color.h"
-#include "colortbl.h"
-
-static char* colorscheme;
-
-#ifdef WIN32
-extern int strcasecmp(const char *s1, const char *s2);
-extern int strncasecmp(const char *s1, const char *s2, unsigned int n);
-#endif
-
-
-static void hsv2rgb(double h, double s, double v,
-			double *r, double *g, double *b)
-{
-    int i;
-    double f, p, q, t;
-
-    if (s <= 0.0) {		/* achromatic */
-	*r = v;
-	*g = v;
-	*b = v;
-    } else {
-	if (h >= 1.0)
-	    h = 0.0;
-	h = 6.0 * h;
-	i = (int) h;
-	f = h - (double) i;
-	p = v * (1 - s);
-	q = v * (1 - (s * f));
-	t = v * (1 - (s * (1 - f)));
-	switch (i) {
-	case 0:
-	    *r = v;
-	    *g = t;
-	    *b = p;
-	    break;
-	case 1:
-	    *r = q;
-	    *g = v;
-	    *b = p;
-	    break;
-	case 2:
-	    *r = p;
-	    *g = v;
-	    *b = t;
-	    break;
-	case 3:
-	    *r = p;
-	    *g = q;
-	    *b = v;
-	    break;
-	case 4:
-	    *r = t;
-	    *g = p;
-	    *b = v;
-	    break;
-	case 5:
-	    *r = v;
-	    *g = p;
-	    *b = q;
-	    break;
-	}
-    }
-}
-
-static void rgb2hsv(double r, double g, double b,
-		double *h, double *s, double *v)
-{
-
-    double rgbmin, rgbmax;
-    double rc, bc, gc;
-    double ht = 0.0, st = 0.0;
-
-    rgbmin = MIN(r, MIN(g, b));
-    rgbmax = MAX(r, MAX(g, b));
-
-    if (rgbmax > 0.0)
-	st = (rgbmax - rgbmin) / rgbmax;
-
-    if (st > 0.0) {
-	rc = (rgbmax - r) / (rgbmax - rgbmin);
-	gc = (rgbmax - g) / (rgbmax - rgbmin);
-	bc = (rgbmax - b) / (rgbmax - rgbmin);
-	if (r == rgbmax)
-	    ht = bc - gc;
-	else if (g == rgbmax)
-	    ht = 2 + rc - bc;
-	else if (b == rgbmax)
-	    ht = 4 + gc - rc;
-	ht = ht * 60.0;
-	if (ht < 0.0)
-	    ht += 360.0;
-    }
-    *h = ht / 360.0;
-    *v = rgbmax;
-    *s = st;
-}
-
-static void rgb2cmyk(double r, double g, double b, double *c, double *m,
-		     double *y, double *k)
-{
-    *c = 1.0 - r;
-    *m = 1.0 - g;
-    *y = 1.0 - b;
-    *k = *c < *m ? *c : *m;
-    *k = *y < *k ? *y : *k;
-    *c -= *k;
-    *m -= *k;
-    *y -= *k;
-}
-
-static int colorcmpf(const void *p0, const void *p1)
-{
-    return strcasecmp(((hsvrgbacolor_t *) p0)->name, ((hsvrgbacolor_t *) p1)->name);
-}
-
-static char *canontoken(char *str)
-{
-    static unsigned char *canon;
-    static int allocated;
-    unsigned char c, *p, *q;
-    int len;
-
-    p = (unsigned char *) str;
-    len = strlen(str);
-    if (len >= allocated) {
-	allocated = len + 1 + 10;
-	canon = newof(canon, unsigned char, allocated, 0);
-	if (!canon)
-	    return NULL;
-    }
-    q = (unsigned char *) canon;
-    while ((c = *p++)) {
-	/* if (isalnum(c) == FALSE) */
-	    /* continue; */
-	if (isupper(c))
-	    c = tolower(c);
-	*q++ = c;
-    }
-    *q = '\0';
-    return (char*)canon;
-}
-
-/* fullColor:
- * Return "/prefix/str"
- */
-static char* fullColor (char* prefix, char* str)
-{
-    static char *fulls;
-    static int allocated;
-    int len = strlen (prefix) + strlen (str) + 3;
-
-    if (len >= allocated) {
-	allocated = len + 10;
-	fulls = newof(fulls, char, allocated, 0);
-    }
-    sprintf (fulls, "/%s/%s", prefix, str);
-    return fulls;
-}
-
-/* resolveColor:
- * Resolve input color str allowing color scheme namespaces.
- *  0) "black" => "black" 
- *     "white" => "white" 
- *     "lightgrey" => "lightgrey" 
- *    NB: This is something of a hack due to the remaining codegen.
- *        Once these are gone, this case could be removed and all references
- *        to "black" could be replaced by "/X11/black".
- *  1) No initial / => 
- *          if colorscheme is defined and no "X11", return /colorscheme/str
- *          else return str
- *  2) One initial / => return str+1
- *  3) Two initial /'s =>
- *       a) If colorscheme is defined and not "X11", return /colorscheme/(str+2)
- *       b) else return (str+2)
- *  4) Two /'s, not both initial => return str.
- *
- * Note that 1), 2), and 3b) allow the default X11 color scheme. 
- *
- * In other words,
- *   xxx => /colorscheme/xxx     if colorscheme is defined and not "X11"
- *   xxx => xxx                  otherwise
- *   /xxx => xxx
- *   /X11/yyy => yyy
- *   /xxx/yyy => /xxx/yyy
- *   //yyy => /colorscheme/yyy   if colorscheme is defined and not "X11"
- *   //yyy => yyy                otherwise
- * 
- * At present, no other error checking is done. For example, 
- * yyy could be "". This will be caught later.
- */
-
-#define DFLT_SCHEME "X11/"      /* Must have final '/' */
-#define DFLT_SCHEME_LEN ((sizeof(DFLT_SCHEME)-1)/sizeof(char))
-#define ISNONDFLT(s) ((s) && *(s) && strncasecmp(DFLT_SCHEME, s, DFLT_SCHEME_LEN-1))
-
-static char* resolveColor (char* str)
-{
-    char* s;
-    char* ss;   /* second slash */
-    char* c2;   /* second char */
-
-    if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str;
-    if ((*str == 'w') || !strncmp(str+1,"hite",4)) return str;
-    if ((*str == 'l') || !strncmp(str+1,"ightgrey",8)) return str;
-    if (*str == '/') {   /* if begins with '/' */
-	c2 = str+1;
-        if ((ss = strchr(c2, '/'))) {  /* if has second '/' */
-	    if (*c2 == '/') {    /* if second '/' is second character */
-		    /* Do not compare against final '/' */
-		if (ISNONDFLT(colorscheme))
-		    s = fullColor (colorscheme, c2+1);
-		else
-		    s = c2+1;
-	    }
-	    else if (strncasecmp(DFLT_SCHEME, c2, DFLT_SCHEME_LEN)) s = str;
-	    else s = ss + 1;
-	}
-	else s = c2;
-    }
-    else if (ISNONDFLT(colorscheme)) s = fullColor (colorscheme, str);
-    else s = str;
-    return canontoken(s);
-}
-
 #undef S
-
-static
-int colorxlate(char *str, gvcolor_t * color, color_type_t target_type)
+static void *grealloc(void *ptr, size_t size)
 {
-    static hsvrgbacolor_t *last;
-    static unsigned char *canon;
-    static int allocated;
-    unsigned char *p, *q;
-    hsvrgbacolor_t fake;
-    unsigned char c;
-    double H, S, V, A, R, G, B;
-    double C, M, Y, K;
-    unsigned int r, g, b, a;
-    int len, rc;
-
-    color->type = target_type;
-
-    rc = COLOR_OK;
-    for (; *str == ' '; str++);	/* skip over any leading whitespace */
-    p = (unsigned char *) str;
-
-    /* test for rgb value such as: "#ff0000"
-       or rgba value such as "#ff000080" */
-    a = 255;			/* default alpha channel value=opaque in case not supplied */
-    if ((*p == '#')
-	&& (sscanf((char *) p, "#%2x%2x%2x%2x", &r, &g, &b, &a) >= 3)) {
-	switch (target_type) {
-	case HSVA_DOUBLE:
-	    R = (double) r / 255.0;
-	    G = (double) g / 255.0;
-	    B = (double) b / 255.0;
-	    A = (double) a / 255.0;
-	    rgb2hsv(R, G, B, &H, &S, &V);
-	    color->u.HSVA[0] = H;
-	    color->u.HSVA[1] = S;
-	    color->u.HSVA[2] = V;
-	    color->u.HSVA[3] = A;
-	    break;
-	case RGBA_BYTE:
-	    color->u.rgba[0] = r;
-	    color->u.rgba[1] = g;
-	    color->u.rgba[2] = b;
-	    color->u.rgba[3] = a;
-	    break;
-	case CMYK_BYTE:
-	    R = (double) r / 255.0;
-	    G = (double) g / 255.0;
-	    B = (double) b / 255.0;
-	    rgb2cmyk(R, G, B, &C, &M, &Y, &K);
-	    color->u.cmyk[0] = (int) C *255;
-	    color->u.cmyk[1] = (int) M *255;
-	    color->u.cmyk[2] = (int) Y *255;
-	    color->u.cmyk[3] = (int) K *255;
-	    break;
-	case RGBA_WORD:
-	    color->u.rrggbbaa[0] = r * 65535 / 255;
-	    color->u.rrggbbaa[1] = g * 65535 / 255;
-	    color->u.rrggbbaa[2] = b * 65535 / 255;
-	    color->u.rrggbbaa[3] = a * 65535 / 255;
-	    break;
-	case RGBA_DOUBLE:
-	    color->u.RGBA[0] = (double) r / 255.0;
-	    color->u.RGBA[1] = (double) g / 255.0;
-	    color->u.RGBA[2] = (double) b / 255.0;
-	    color->u.RGBA[3] = (double) a / 255.0;
-	    break;
-	case COLOR_STRING:
-	    break;
-	case COLOR_INDEX:
-	    break;
-	}
-	return rc;
-    }
-
-    /* test for hsv value such as: ".6,.5,.3" */
-    if (((c = *p) == '.') || isdigit(c)) {
-	int cnt;
-	len = strlen((char*)p);
-	if (len >= allocated) {
-	    allocated = len + 1 + 10;
-	    canon = newof(canon, unsigned char, allocated, 0);
-	    if (! canon) {
-		rc = COLOR_MALLOC_FAIL;
-		return rc;
-	    }
-	}
-	q = canon;
-	while ((c = *p++)) {
-	    if (c == ',')
-		c = ' ';
-	    *q++ = c;
-	}
-	*q = '\0';
-
-	if ((cnt = sscanf((char *) canon, "%lf%lf%lf%lf", &H, &S, &V, &A)) >= 3) {
-	    /* clip to reasonable values */
-	    H = MAX(MIN(H, 1.0), 0.0);
-	    S = MAX(MIN(S, 1.0), 0.0);
-	    V = MAX(MIN(V, 1.0), 0.0);
-	    if (cnt == 4)
-		A = MAX(MIN(A, 1.0), 0.0);
-	    else
-		A = 1.0;
-	    switch (target_type) {
-	    case HSVA_DOUBLE:
-		color->u.HSVA[0] = H;
-		color->u.HSVA[1] = S;
-		color->u.HSVA[2] = V;
-		color->u.HSVA[3] = A;
-		break;
-	    case RGBA_BYTE:
-		hsv2rgb(H, S, V, &R, &G, &B);
-		color->u.rgba[0] = (int) (R * 255);
-		color->u.rgba[1] = (int) (G * 255);
-		color->u.rgba[2] = (int) (B * 255);
-		color->u.rgba[3] = (int) (A * 255);
-		break;
-	    case CMYK_BYTE:
-		hsv2rgb(H, S, V, &R, &G, &B);
-		rgb2cmyk(R, G, B, &C, &M, &Y, &K);
-		color->u.cmyk[0] = (int) C *255;
-		color->u.cmyk[1] = (int) M *255;
-		color->u.cmyk[2] = (int) Y *255;
-		color->u.cmyk[3] = (int) K *255;
-		break;
-	    case RGBA_WORD:
-		hsv2rgb(H, S, V, &R, &G, &B);
-		color->u.rrggbbaa[0] = (int) (R * 65535);
-		color->u.rrggbbaa[1] = (int) (G * 65535);
-		color->u.rrggbbaa[2] = (int) (B * 65535);
-		color->u.rrggbbaa[3] = (int) (A * 65535);
-		break;
-	    case RGBA_DOUBLE:
-		hsv2rgb(H, S, V, &R, &G, &B);
-		color->u.RGBA[0] = R;
-		color->u.RGBA[1] = G;
-		color->u.RGBA[2] = B;
-		color->u.RGBA[3] = A;
-		break;
-	    case COLOR_STRING:
-		break;
-	    case COLOR_INDEX:
-		break;
-	    }
-	    return rc;
-	}
+    void *p = realloc(ptr, size);
+    if (p == NULL && size) {
+        fprintf(stderr, "out of memory\n");
     }
-
-    /* test for known color name (generic, not renderer specific known names) */
-    fake.name = resolveColor(str);
-    if (!fake.name)
-	return COLOR_MALLOC_FAIL;
-    if ((last == NULL)
-	|| (last->name[0] != fake.name[0])
-	|| (strcmp(last->name, fake.name))) {
-	last = (hsvrgbacolor_t *) bsearch((void *) &fake,
-				      (void *) color_lib,
-				      sizeof(color_lib) /
-				      sizeof(hsvrgbacolor_t), sizeof(fake),
-				      colorcmpf);
-    }
-    if (last != NULL) {
-	switch (target_type) {
-	case HSVA_DOUBLE:
-	    color->u.HSVA[0] = ((double) last->h) / 255.0;
-	    color->u.HSVA[1] = ((double) last->s) / 255.0;
-	    color->u.HSVA[2] = ((double) last->v) / 255.0;
-	    color->u.HSVA[3] = ((double) last->a) / 255.0;
-	    break;
-	case RGBA_BYTE:
-	    color->u.rgba[0] = last->r;
-	    color->u.rgba[1] = last->g;
-	    color->u.rgba[2] = last->b;
-	    color->u.rgba[3] = last->a;
-	    break;
-	case CMYK_BYTE:
-	    R = (last->r) / 255.0;
-	    G = (last->g) / 255.0;
-	    B = (last->b) / 255.0;
-	    rgb2cmyk(R, G, B, &C, &M, &Y, &K);
-	    color->u.cmyk[0] = (int) C * 255;
-	    color->u.cmyk[1] = (int) M * 255;
-	    color->u.cmyk[2] = (int) Y * 255;
-	    color->u.cmyk[3] = (int) K * 255;
-	    break;
-	case RGBA_WORD:
-	    color->u.rrggbbaa[0] = last->r * 65535 / 255;
-	    color->u.rrggbbaa[1] = last->g * 65535 / 255;
-	    color->u.rrggbbaa[2] = last->b * 65535 / 255;
-	    color->u.rrggbbaa[3] = last->a * 65535 / 255;
-	    break;
-	case RGBA_DOUBLE:
-	    color->u.RGBA[0] = last->r / 255.0;
-	    color->u.RGBA[1] = last->g / 255.0;
-	    color->u.RGBA[2] = last->b / 255.0;
-	    color->u.RGBA[3] = last->a / 255.0;
-	    break;
-	case COLOR_STRING:
-	    break;
-	case COLOR_INDEX:
-	    break;
-	}
-	return rc;
-    }
-
-    /* if we're still here then we failed to find a valid color spec */
-    rc = COLOR_UNKNOWN;
-    switch (target_type) {
-    case HSVA_DOUBLE:
-	color->u.HSVA[0] = color->u.HSVA[1] = color->u.HSVA[2] = 0.0;
-	color->u.HSVA[3] = 1.0; /* opaque */
-	break;
-    case RGBA_BYTE:
-	color->u.rgba[0] = color->u.rgba[1] = color->u.rgba[2] = 0;
-	color->u.rgba[3] = 255;	/* opaque */
-	break;
-    case CMYK_BYTE:
-	color->u.cmyk[0] =
-	    color->u.cmyk[1] = color->u.cmyk[2] = color->u.cmyk[3] = 0;
-	break;
-    case RGBA_WORD:
-	color->u.rrggbbaa[0] = color->u.rrggbbaa[1] = color->u.rrggbbaa[2] = 0;
-	color->u.rrggbbaa[3] = 65535;	/* opaque */
-	break;
-    case RGBA_DOUBLE:
-	color->u.RGBA[0] = color->u.RGBA[1] = color->u.RGBA[2] = 0.0;
-	color->u.RGBA[3] = 1.0;	/* opaque */
-	break;
-    case COLOR_STRING:
-	break;
-    case COLOR_INDEX:
-	break;
-    }
-    return rc;
+    return p;
 }
 
+#include "colxlate.c"
+
 /* colorx:
  * RGB, RGBA, HSV, HSVA, CMYK
  */
@@ -1340,6 +884,7 @@ char *colorx (Expr_t* ex, char* incolor, char* fmt, Sfio_t* fp)
     return exstring(ex, sfstruse(fp));
 }
 
+
 #ifndef WIN32
 
 #include        <unistd.h>