diff options
author | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:17:32 +0000 |
---|---|---|
committer | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:17:32 +0000 |
commit | cda0fb3b8a7cb56045b24fd0af0ed36591b5d7eb (patch) | |
tree | 31ef197ec5c98ac9ac08714a2440a787c065d8c7 /include/gutenprint | |
parent | 92b02ddce00dec2787514568fa9d644d4f0350e9 (diff) |
Imported Upstream version 5.0.1
Diffstat (limited to 'include/gutenprint')
-rw-r--r-- | include/gutenprint/Makefile.in | 46 | ||||
-rw-r--r-- | include/gutenprint/bit-ops.h | 13 | ||||
-rw-r--r-- | include/gutenprint/util.h | 9 | ||||
-rw-r--r-- | include/gutenprint/vars.h | 5 | ||||
-rw-r--r-- | include/gutenprint/xml.h | 8 |
5 files changed, 61 insertions, 20 deletions
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in index de24e93..dc8850a 100644 --- a/include/gutenprint/Makefile.in +++ b/include/gutenprint/Makefile.in @@ -49,18 +49,17 @@ subdir = include/gutenprint ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \ - $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \ - $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \ + $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \ + $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gutenprint-version.h -depcomp = -am__depfiles_maybe = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -80,13 +79,18 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@ +BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@ BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@ +BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@ BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@ BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@ BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@ @@ -112,6 +116,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@ BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@ BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@ BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@ +BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@ +BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@ BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@ BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@ BUILD_TEST_FALSE = @BUILD_TEST_FALSE@ @@ -119,6 +125,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@ BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@ BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CONVERT = @CONVERT@ CPP = @CPP@ @@ -131,12 +138,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ CXX = @CXX@ CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ DB2PS = @DB2PS@ DEFS = @DEFS@ +DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DVIPDF = @DVIPDF@ @@ -171,6 +180,7 @@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ GNUCFLAGS = @GNUCFLAGS@ +GREP = @GREP@ GTK2_CFLAGS = @GTK2_CFLAGS@ GTK2_LIBS = @GTK2_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ @@ -266,14 +276,17 @@ VERSION = @VERSION@ WHICH_PPDS = @WHICH_PPDS@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ +YFLAGS = @YFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ @@ -290,6 +303,9 @@ cups_exec_prefix = @cups_exec_prefix@ cups_prefix = @cups_prefix@ cups_sbindir = @cups_sbindir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ gimp2_plug_indir = @gimp2_plug_indir@ gimp_plug_indir = @gimp_plug_indir@ @@ -307,17 +323,21 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -366,9 +386,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps include/gutenprint/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/gutenprint/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu --ignore-deps include/gutenprint/Makefile + $(AUTOMAKE) --gnu include/gutenprint/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h index 877c191..d779b74 100644 --- a/include/gutenprint/bit-ops.h +++ b/include/gutenprint/bit-ops.h @@ -1,5 +1,5 @@ /* - * "$Id: bit-ops.h,v 1.2 2005/06/29 01:42:34 rlk Exp $" + * "$Id: bit-ops.h,v 1.2.14.1 2007/05/12 19:14:27 faust3 Exp $" * * Softweave calculator for gimp-print. * @@ -32,7 +32,16 @@ extern "C" { #endif -extern void stp_fold(const unsigned char *line, int single_height, +extern void stp_fold(const unsigned char *line, int single_length, + unsigned char *outbuf); + +extern void stp_fold_3bit(const unsigned char *line, int single_length, + unsigned char *outbuf); + +extern void stp_fold_3bit_323(const unsigned char *line, int single_length, + unsigned char *outbuf); + +extern void stp_fold_4bit(const unsigned char *line, int single_length, unsigned char *outbuf); extern void stp_split_2(int height, int bits, const unsigned char *in, diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h index a0fb793..a146af4 100644 --- a/include/gutenprint/util.h +++ b/include/gutenprint/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h,v 1.2 2005/04/10 23:15:16 rlk Exp $" + * "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $" * * libgimpprint utility and miscellaneous functions. * @@ -36,6 +36,10 @@ extern "C" { #endif +#if !defined(__GNUC__) && !defined(__attribute__) +# define __attribute__(x) +#endif /* !__GNUC__ && !__attribute__ */ + /** * Utility functions. * @@ -88,6 +92,7 @@ extern void stp_put16_be(unsigned short sh, const stp_vars_t *v); extern void stp_put32_le(unsigned int sh, const stp_vars_t *v); extern void stp_put32_be(unsigned int sh, const stp_vars_t *v); extern void stp_puts(const char *s, const stp_vars_t *v); +extern void stp_putraw(const stp_raw_t *r, const stp_vars_t *v); extern void stp_send_command(const stp_vars_t *v, const char *command, const char *format, ...); @@ -173,5 +178,5 @@ extern const char *stp_get_release_version(void); #endif /* GUTENPRINT_UTIL_H */ /* - * End of "$Id: util.h,v 1.2 2005/04/10 23:15:16 rlk Exp $". + * End of "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $". */ diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h index aacdbc1..de6eb25 100644 --- a/include/gutenprint/vars.h +++ b/include/gutenprint/vars.h @@ -129,6 +129,9 @@ typedef struct const void *data; /*!< Raw data. */ } stp_raw_t; +#define STP_RAW(x) { sizeof((x)), (x) } +#define STP_RAW_STRING(x) { sizeof((x)) - 1, (x) } + /** double_bound (range) parameter. */ typedef struct { @@ -1380,5 +1383,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc, #endif /* GUTENPRINT_VARS_H */ /* - * End of "$Id: vars.h,v 1.3 2006/04/17 02:06:18 rlk Exp $". + * End of "$Id: vars.h,v 1.3.8.1 2007/03/02 12:01:14 rlk Exp $". */ diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h index 7be3235..5f88686 100644 --- a/include/gutenprint/xml.h +++ b/include/gutenprint/xml.h @@ -1,5 +1,5 @@ /* - * "$Id: xml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $" + * "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $" * * Gutenprint module loader header * @@ -70,7 +70,11 @@ extern stp_array_t *stp_array_create_from_xmltree(stp_mxml_node_t *array); extern stp_mxml_node_t *stp_xmltree_create_from_array(const stp_array_t *array); extern void stp_xml_parse_file_named(const char *name); +#ifdef __cplusplus +} +#endif + #endif /* GUTENPRINT_XML_H */ /* - * End of "$Id: xml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $". + * End of "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $". */ |