Imported Upstream version 5.2.6

4 files changed, 23 insertions, 7 deletions

diff --git a/include/gutenprint/Makefile.am b/include/gutenprint/Makefile.am
index bb0024c..2558cd6 100644
--- a/include/gutenprint/Makefile.am
+++ b/include/gutenprint/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2006/09/18 01:48:58 rlk Exp $
+## $Id: Makefile.am,v 1.4 2010/07/05 15:18:08 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,6 @@ pkginclude_HEADERS = \
 	curve-cache.h \
 	curve.h \
 	dither.h \
-	sequence.h \
 	image.h \
 	list.h \
 	module.h \
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index a6aebfc..0e51e36 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -295,7 +295,6 @@ pkginclude_HEADERS = \
 	curve-cache.h \
 	curve.h \
 	dither.h \
-	sequence.h \
 	image.h \
 	list.h \
 	module.h \
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 194b6b0..2739c1d 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h,v 1.6 2009/10/05 12:37:30 rlk Exp $"
+ * "$Id: printers.h,v 1.7 2010/08/07 02:30:38 rlk Exp $"
  *
  *   libgimpprint printer functions.
  *
@@ -91,6 +91,14 @@ extern const stp_printer_t *stp_get_printer_by_driver(const char *driver);
 extern const stp_printer_t *stp_get_printer_by_device_id(const char *device_id);
 
 /**
+ * Get a printer model by its foomatic ID.
+ * @param foomatic_id the printer model's foomatic ID
+ * @returns a pointer to the printer model, or NULL on failure.  The
+ * pointer should not be freed.
+ */
+extern const stp_printer_t *stp_get_printer_by_foomatic_id(const char *foomatic_id);
+
+/**
  * Get the printer model from a vars object.
  * @param v the vars to use.
  * @returns a pointer to the printer model, or NULL on failure.  The
@@ -144,6 +152,13 @@ extern const char *stp_printer_get_family(const stp_printer_t *p);
 extern const char *stp_printer_get_manufacturer(const stp_printer_t *p);
 
 /**
+ * Get a printer model's foomatic ID
+ * @param p the printer model to use.
+ * @returns the foomatic ID or NULL (should never be freed)
+ */
+extern const char *stp_printer_get_foomatic_id(const stp_printer_t *p);
+
+/**
  * Get a printer model's model number.
  * The model number is used internally by the "family" driver module,
  * and has no meaning out of that context.  It bears no relation to
@@ -270,5 +285,5 @@ const char *stp_describe_output(const stp_vars_t *v);
 
 #endif /* GUTENPRINT_PRINTERS_H */
 /*
- * End of "$Id: printers.h,v 1.6 2009/10/05 12:37:30 rlk Exp $".
+ * End of "$Id: printers.h,v 1.7 2010/08/07 02:30:38 rlk Exp $".
  */
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index db322f1..352b40d 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $"
+ * "$Id: util.h,v 1.9 2010/08/04 00:33:55 rlk Exp $"
  *
  *   libgimpprint utility and miscellaneous functions.
  *
@@ -86,6 +86,8 @@ extern void stp_zprintf(const stp_vars_t *v, const char *format, ...)
 extern void stp_zfwrite(const char *buf, size_t bytes, size_t nitems,
 			const stp_vars_t *v);
 
+extern void stp_write_raw(const stp_raw_t *raw, const stp_vars_t *v);
+
 extern void stp_putc(int ch, const stp_vars_t *v);
 extern void stp_put16_le(unsigned short sh, const stp_vars_t *v);
 extern void stp_put16_be(unsigned short sh, const stp_vars_t *v);
@@ -130,6 +132,7 @@ extern void stp_catprintf(char **strp, const char *format, ...)
 #define STP_DBG_CURVE_ERRORS	0x100000
 #define STP_DBG_PPD		0x200000
 #define STP_DBG_NO_COMPRESSION	0x400000
+#define STP_DBG_ASSERTIONS	0x800000
 
 extern unsigned long stp_get_debug_level(void);
 extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
@@ -180,5 +183,5 @@ extern const char *stp_get_release_version(void);
 
 #endif /* GUTENPRINT_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.7 2008/07/13 18:05:10 rlk Exp $".
+ * End of "$Id: util.h,v 1.9 2010/08/04 00:33:55 rlk Exp $".
  */