From 409ff70e752ac166f3da0d876a48baa8e1e9c412 Mon Sep 17 00:00:00 2001 From: ellson Date: Mon, 6 Oct 2008 16:43:57 +0000 Subject: [PATCH] some renaming --- lib/inkpot/test/Makefile | 8 ++- lib/inkpot/test/inkpot_lib_define.h | 59 +++++++++++++++++++ lib/inkpot/test/inkpot_lib_scheme.h | 90 +++++++++++++++++++++++++++++ lib/inkpot/test/inkpot_lib_value.h | 49 ++++++++++++++++ 4 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 lib/inkpot/test/inkpot_lib_define.h create mode 100644 lib/inkpot/test/inkpot_lib_scheme.h create mode 100644 lib/inkpot/test/inkpot_lib_value.h diff --git a/lib/inkpot/test/Makefile b/lib/inkpot/test/Makefile index f3b49e81e..e76535e64 100644 --- a/lib/inkpot/test/Makefile +++ b/lib/inkpot/test/Makefile @@ -6,12 +6,14 @@ inkpot: inkpot.o $(LIBINKPOT) inkpot.o: inkpot.c inkpot.h -inkpot_scheme.o: inkpot_scheme.c inkpot_scheme.h inkpot.h inkpot_define.h \ - inkpot_value.h inkpot_xlate.h inkpot_scheme_table.h +inkpot_scheme.o: inkpot_scheme.c inkpot_scheme.h inkpot.h \ + inkpot_lib_define.h inkpot_lib_scheme.h \ + inkpot_value.h inkpot_xlate.h inkpot_xlate.o: inkpot_xlate.c inkpot_xlate.h inkpot.h -inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h inkpot_value_table.h +inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h \ + inkpot_lib_define.h inkpot_value_table.h inkpot.c: ln -s ../inkpot.c diff --git a/lib/inkpot/test/inkpot_lib_define.h b/lib/inkpot/test/inkpot_lib_define.h new file mode 100644 index 000000000..bad79ca10 --- /dev/null +++ b/lib/inkpot/test/inkpot_lib_define.h @@ -0,0 +1,59 @@ +/* $Id$ $Revision$ */ +/* vim:set shiftwidth=4 ts=8: */ + +/*********************************************************** + * This software is part of the graphviz package * + * http://www.graphviz.org/ * + * * + * Copyright (c) 1994-2008 AT&T Corp. * + * and is licensed under the * + * Common Public License, Version 1.0 * + * by AT&T Corp. * + * * + * Information and Software Systems Research * + * AT&T Research, Florham Park NJ * + **********************************************************/ + +#define SZT_COLOR_STRINGS 57 +#define SZL_COLOR_STRINGS 6 +typedef unsigned int IDX_COLOR_STRINGS; + +#define SZT_SCHEME_STRINGS 23 +#define SZL_SCHEME_STRINGS 6 +typedef unsigned int IDX_SCHEME_STRINGS; + +#define SZT_SCHEMES 3 +typedef unsigned short MSK_SCHEMES; +typedef unsigned char IDX_SCHEMES; + +#define SZT_SCHEMES_INDEX 2 +typedef unsigned char IDX_SCHEMES_INDEX; + +#define SZT_NAMES 10 +typedef unsigned int IDX_NAMES; + +#define SZT_ALTS 2 +typedef unsigned char IDX_ALTS; + +#define SZT_IXVALUES 7 +typedef unsigned int IDX_IXVALUES; + +#define SZT_VALUE_TO 7 +typedef unsigned int IDX_VALUE_TO; + +#define SZT_TO_NAMES 11 +typedef unsigned int IDX_TO_NAMES; + + +#define SZT_VALUES 7 +typedef unsigned char IDX_VALUES; + +#define SZT_VALUES_64 7 +typedef unsigned char IDX_VALUES_64; + +#define SZT_VALUES_24 21 +typedef unsigned char IDX_VALUES_24; + +#define SZT_NONAME_VALUES 4 +#define SZT_NONAME_VALUES_64 4 +#define SZT_NONAME_VALUES_24 12 diff --git a/lib/inkpot/test/inkpot_lib_scheme.h b/lib/inkpot/test/inkpot_lib_scheme.h new file mode 100644 index 000000000..700555b76 --- /dev/null +++ b/lib/inkpot/test/inkpot_lib_scheme.h @@ -0,0 +1,90 @@ +/* $Id$ $Revision$ */ +/* vim:set shiftwidth=4 ts=8: */ + +/*********************************************************** + * This software is part of the graphviz package * + * http://www.graphviz.org/ * + * * + * Copyright (c) 1994-2008 AT&T Corp. * + * and is licensed under the * + * Common Public License, Version 1.0 * + * by AT&T Corp. * + * * + * Information and Software Systems Research * + * AT&T Research, Florham Park NJ * + **********************************************************/ + +const char TAB_COLOR_STRINGS[SZT_COLOR_STRINGS] = { + "black\0" + "bleu\0" + "blue\0" + "green\0" + "jaune\0" + "red\0" + "rouge\0" + "vert\0" + "white\0" + "yellow\0" +}; + +const char TAB_SCHEME_STRINGS[SZT_SCHEME_STRINGS] = { + "french\0" + "svg\0" + "x11\0" + "xxx\0" + "yyy\0" +}; + +inkpot_scheme_name_t TAB_SCHEMES[SZT_SCHEMES] = { /* schemes of named colors */ + { 0, }, /* french */ + { 7, }, /* svg */ + { 11, }, /* x11 */ +}; + +inkpot_scheme_index_t TAB_SCHEMES_INDEX[SZT_SCHEMES_INDEX] = { /* schemes of indexed colors */ + { 15, 0, }, /* xxx */ + { 19, 5, }, /* yyy */ +}; + +inkpot_name_t TAB_NAMES[SZT_NAMES] = { /* Must be LC_ALL=C sort'ed by name with each alt */ + { 0, 0, 0x6, }, /* black */ + { 6, 1, 0x1, }, /* bleu */ + { 11, 1, 0x6, }, /* blue */ + { 16, 2, 0x6, }, /* green */ + { 22, 5, 0x1, }, /* jaune */ + { 28, 3, 0x6, }, /* red */ + { 32, 3, 0x1, }, /* rouge */ + { 38, 2, 0x1, }, /* vert */ + { 43, 6, 0x6, }, /* white */ + { 50, 0, 0, }, /* yellow (w. alts) */ +}; + +inkpot_name_t TAB_ALTS[SZT_ALTS] = { + { 1, 5, 0x4, }, /* yellow (x11) */ + { 0, 4, 0x2, }, /* yellow (svg) */ +}; + +IDX_VALUE_TO TAB_VALUE_TO[SZT_VALUE_TO] = { + 0, /* black */ + 1, /* bleu, blue */ + 3, /* green, vert */ + 5, /* red, rouge */ + 7, /* yellow (svg) */ + 8, /* yellow (x11), jaune */ + 10, /* white */ +}; + +IDX_NAMES TAB_TO_NAMES[SZT_TO_NAMES] = { + 0, /* black */ + 1, 2, /* bleu, blue */ + 3, 7, /* green, vert */ + 5, 6, /* red, rouge */ + 9, /* yellow(alt1) */ + 4, 9, /* jaune, yellow */ + 8, /* white */ +}; + +IDX_VALUES TAB_IXVALUES[SZT_IXVALUES] = { + 7, 8, 9, 10, 1, /* xxx */ + 0, 6, /* yyy */ +}; diff --git a/lib/inkpot/test/inkpot_lib_value.h b/lib/inkpot/test/inkpot_lib_value.h new file mode 100644 index 000000000..620183b23 --- /dev/null +++ b/lib/inkpot/test/inkpot_lib_value.h @@ -0,0 +1,49 @@ +/* $Id$ $Revision$ */ +/* vim:set shiftwidth=4 ts=8: */ + +/*********************************************************** + * This software is part of the graphviz package * + * http://www.graphviz.org/ * + * * + * Copyright (c) 1994-2008 AT&T Corp. * + * and is licensed under the * + * Common Public License, Version 1.0 * + * by AT&T Corp. * + * * + * Information and Software Systems Research * + * AT&T Research, Florham Park NJ * + **********************************************************/ + +unsigned long TAB_VALUES_64[SZT_VALUES_64] = { + 0x000000000000ffff, /* black */ + 0x00000000ffffffff, /* bleu, blue */ + 0x0000ffff0000ffff, /* green, vert */ + 0xffff00000000ffff, /* red, rouge */ + 0xffffcf000000ffff, /* yellow (svg) */ + 0xffffffff0000ffff, /* yellow (x11), jaune */ + 0xffffffffffffffff, /* white */ +}; + +unsigned long TAB_NONAME_VALUES_64[SZT_NONAME_VALUES_64] = { + 0x000000008000ffff, + 0x00000000a400ffff, + 0x00000000c800ffff, + 0x00000000ea00ffff, +}; + +unsigned char TAB_VALUES_24[SZT_VALUES_24] = { + 0, 0, 0, /* black */ + 0, 0, 255, /* bleu, blue */ + 0, 255, 0, /* green, vert */ + 255, 0, 0, /* red, rouge */ + 255, 192, 0, /* yellow (svg) */ + 255, 255, 255, /* yellow (x11), jaune */ + 255, 255, 255, /* white */ +}; + +unsigned char TAB_NONAME_VALUES_24[SZT_NONAME_VALUES_24] = { + 0, 0, 128, + 0, 0, 160, + 0, 0, 192, + 0, 0, 224, +}; -- 2.40.0