summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2008-10-26 16:13:15 +0000
committerRoger Leigh <rleigh@debian.org>2008-10-26 16:13:15 +0000
commit162bb22c0a612c065ea77a88136fcf8ded9159a9 (patch)
tree5dd9b87d64c613ad2fc3998e80aa9fbf1400f537 /src/main
parente74aac350fb79d8cc3ed6a97451b30443ad9dac9 (diff)
Imported Upstream version 4.3.99+cvs20051122.dfsg.1
Diffstat (limited to 'src/main')
-rw-r--r--src/main/Makefile.am6
-rw-r--r--src/main/Makefile.in94
-rw-r--r--src/main/color-conversion.h3
-rw-r--r--src/main/curve-cache.c4
-rw-r--r--src/main/escp2-channels.c307
-rw-r--r--src/main/escp2-inks.c29
-rw-r--r--src/main/escp2-papers.c279
-rw-r--r--src/main/escp2-resolutions.c12
-rw-r--r--src/main/path.c4
-rw-r--r--src/main/print-canon.c595
-rw-r--r--src/main/print-color.c145
-rw-r--r--src/main/print-dither-matrices.c24
-rw-r--r--src/main/print-escp2-data.c60
-rw-r--r--src/main/print-escp2.c53
-rw-r--r--src/main/print-escp2.h11
-rw-r--r--src/main/print-olympus.c120
-rw-r--r--src/main/print-pcl.c4
-rw-r--r--src/main/print-ps.c23
-rw-r--r--src/main/print-raw.c3
-rw-r--r--src/main/print-vars.c68
-rw-r--r--src/main/printers.xml159
21 files changed, 1709 insertions, 294 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 3377183..aa19a62 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.91 2005/06/26 10:56:51 rleigh Exp $
+## $Id: Makefile.am,v 1.92 2005/11/21 11:16:23 rleigh Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
## Process this file with automake to produce Makefile.in.
-AUTOMAKE_OPTIONS = 1.4 gnu
-
@SET_MAKE@
-MAINT_CHARSET = latin1
-
include $(top_srcdir)/scripts/global.mk
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 1bd64de..7fe8e15 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
# Variables
-SOURCES = $(color_traditional_la_SOURCES) $(libgutenprint_la_SOURCES) $(print_canon_la_SOURCES) $(print_escp2_la_SOURCES) $(print_lexmark_la_SOURCES) $(print_olympus_la_SOURCES) $(print_pcl_la_SOURCES) $(print_ps_la_SOURCES) $(print_raw_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -146,8 +144,8 @@ am_print_raw_la_OBJECTS = print-raw.lo
print_raw_la_OBJECTS = $(am_print_raw_la_OBJECTS)
@BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -174,8 +172,6 @@ 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@
@@ -213,7 +209,6 @@ 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@
@@ -226,14 +221,12 @@ 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@
@@ -368,13 +361,8 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
-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@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
@@ -420,8 +408,6 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
pkgconfigdatadir = $(libdir)/pkgconfig
pkgxmldatadir = $(pkgdatadir)/$(VERSION)/xml
@@ -559,9 +545,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/main/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps src/main/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/main/Makefile
+ $(AUTOMAKE) --gnu --ignore-deps src/main/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -660,74 +646,14 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit-ops.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-conversions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve-cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ed.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-eventone.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-inks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ordered.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-predithered.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-very-fast.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-channels.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-driver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-inks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-papers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-resolutions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic-options.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-attr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-node.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-canon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dither-matrices.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2-data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-lexmark.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-olympus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-papers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-pcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-ps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-raw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-vars.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-version.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-weave.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@@ -891,7 +817,6 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
clean-pkgmoduleLTLIBRARIES mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@@ -918,7 +843,6 @@ install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/main/color-conversion.h b/src/main/color-conversion.h
index 28deb53..ab04380 100644
--- a/src/main/color-conversion.h
+++ b/src/main/color-conversion.h
@@ -1,5 +1,5 @@
/*
- * "$Id: color-conversion.h,v 1.10 2005/07/04 00:23:54 rlk Exp $"
+ * "$Id: color-conversion.h,v 1.11 2005/09/17 21:54:33 rlk Exp $"
*
* Gutenprint color management module - traditional Gimp-Print algorithm.
*
@@ -160,6 +160,7 @@ typedef struct
double brightness;
int linear_contrast_adjustment;
int printed_colorfunc;
+ int simple_gamma_correction;
stp_cached_curve_t hue_map;
stp_cached_curve_t lum_map;
stp_cached_curve_t sat_map;
diff --git a/src/main/curve-cache.c b/src/main/curve-cache.c
index 37b51b0..1ae7d0e 100644
--- a/src/main/curve-cache.c
+++ b/src/main/curve-cache.c
@@ -1,5 +1,5 @@
/*
- * "$Id: curve-cache.c,v 1.5 2004/09/17 18:38:17 rleigh Exp $"
+ * "$Id: curve-cache.c,v 1.6 2005/10/18 02:08:17 rlk Exp $"
*
* Gimp-Print color management module - traditional Gimp-Print algorithm.
*
@@ -88,7 +88,7 @@ stp_curve_cache_set_curve_copy(stp_cached_curve_t *cache, const stp_curve_t *cur
cache->curve = stp_curve_create_copy(curve);
}
-const size_t
+size_t
stp_curve_cache_get_count(stp_cached_curve_t *cache)
{
if (cache->curve)
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 2946e06..15392c2 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-channels.c,v 1.56 2005/07/03 22:13:36 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.58 2005/10/29 21:31:19 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -200,6 +200,13 @@ static const physical_subchannel_t standard_black_subchannels[] =
DECLARE_INK_CHANNEL(standard_black);
+static const physical_subchannel_t f360_black_subchannels[] =
+{
+ { 0, 0, 1, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_black);
+
static const physical_subchannel_t x80_black_subchannels[] =
{
{ 0, -1, 48, "BlackDensity", NULL }
@@ -389,12 +396,12 @@ static const physical_subchannel_t standard_photo_black_subchannels[] =
DECLARE_INK_CHANNEL(standard_photo_black);
-static const physical_subchannel_t f360_r800_photo_black_subchannels[] =
+static const physical_subchannel_t f360_photo_black_subchannels[] =
{
{ 0, 4, 1, "BlackDensity", NULL }
};
-DECLARE_INK_CHANNEL(f360_r800_photo_black);
+DECLARE_INK_CHANNEL(f360_photo_black);
static const physical_subchannel_t r800_matte_black_subchannels[] =
{
@@ -410,19 +417,19 @@ static const physical_subchannel_t photo_black_subchannels[] =
DECLARE_INK_CHANNEL(photo_black);
-static const physical_subchannel_t f360_photo_black_subchannels[] =
+static const physical_subchannel_t extended_black_subchannels[] =
{
- { 0, 0, 0, "BlackDensity", NULL }
+ { 0, 1, 0, "BlackDensity", NULL }
};
-DECLARE_INK_CHANNEL(f360_photo_black);
+DECLARE_INK_CHANNEL(extended_black);
-static const physical_subchannel_t extended_black_subchannels[] =
+static const physical_subchannel_t f360_extended_black_subchannels[] =
{
- { 0, 1, 0, "BlackDensity", NULL }
+ { 0, 1, 1, "BlackDensity", NULL }
};
-DECLARE_INK_CHANNEL(extended_black);
+DECLARE_INK_CHANNEL(f360_extended_black);
static const physical_subchannel_t photo_cyan_subchannels[] =
{
@@ -439,6 +446,13 @@ static const physical_subchannel_t extended_cyan_subchannels[] =
DECLARE_INK_CHANNEL(extended_cyan);
+static const physical_subchannel_t f360_extended_cyan_subchannels[] =
+{
+ { 2, 1, 1, "CyanDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_cyan);
+
static const physical_subchannel_t photo_magenta_subchannels[] =
{
{ 1, 0, 0, "MagentaDensity", NULL },
@@ -454,6 +468,13 @@ static const physical_subchannel_t extended_magenta_subchannels[] =
DECLARE_INK_CHANNEL(extended_magenta);
+static const physical_subchannel_t f360_extended_magenta_subchannels[] =
+{
+ { 1, 1, 1, "MagentaDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_magenta);
+
static const physical_subchannel_t photo_yellow_subchannels[] =
{
{ 4, 0, 0, "YellowDensity", NULL }
@@ -475,6 +496,20 @@ static const physical_subchannel_t j_extended_yellow_subchannels[] =
DECLARE_INK_CHANNEL(j_extended_yellow);
+static const physical_subchannel_t extended_photo3_black_subchannels[] =
+{
+ { 0, 3, 0, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(extended_photo3_black);
+
+static const physical_subchannel_t f360_extended_photo3_black_subchannels[] =
+{
+ { 0, 3, 1, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_photo3_black);
+
/* For Japanese 7-color printers, with dark yellow */
static const physical_subchannel_t photo2_yellow_subchannels[] =
{
@@ -508,6 +543,24 @@ static const physical_subchannel_t f360_photo2_black_subchannels[] =
DECLARE_INK_CHANNEL(f360_photo2_black);
+static const physical_subchannel_t photo3_black_subchannels[] =
+{
+ { 0, 0, 0, "BlackDensity", NULL },
+ { 0, 1, 0, "BlackDensity", "GrayTransition" },
+ { 0, 3, 0, "BlackDensity", "LightGrayTransition" }
+};
+
+DECLARE_INK_CHANNEL(photo3_black);
+
+static const physical_subchannel_t f360_photo3_black_subchannels[] =
+{
+ { 0, 0, 1, "BlackDensity", NULL },
+ { 0, 1, 0, "BlackDensity", "GrayTransition" },
+ { 0, 3, 1, "BlackDensity", "LightGrayTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360_photo3_black);
+
static const physical_subchannel_t quadtone_subchannels[] =
{
{ 0, -1, 0, "BlackDensity", NULL },
@@ -566,6 +619,14 @@ static const physical_subchannel_t f360_photo_cyan_subchannels[] =
DECLARE_INK_CHANNEL(f360_photo_cyan);
+static const physical_subchannel_t f360x_photo_cyan_subchannels[] =
+{
+ { 2, 0, 0, "CyanDensity", NULL },
+ { 2, 1, 1, "CyanDensity", "LightCyanTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360x_photo_cyan);
+
static const physical_subchannel_t f360_photo_magenta_subchannels[] =
{
{ 1, 0, 1, "MagentaDensity", NULL },
@@ -574,6 +635,14 @@ static const physical_subchannel_t f360_photo_magenta_subchannels[] =
DECLARE_INK_CHANNEL(f360_photo_magenta);
+static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
+{
+ { 1, 0, 0, "MagentaDensity", NULL },
+ { 1, 1, 1, "MagentaDensity", "LightMagentaTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360x_photo_magenta);
+
#define DECLARE_CHANNEL_SET(name) \
static const channel_set_t name##_channel_set = \
@@ -642,7 +711,7 @@ const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
static const ink_channel_t *const standard_photo_gloss_black_channels[] =
{
- &f360_r800_photo_black_channel, &standard_gloss_channel
+ &f360_photo_black_channel, &standard_gloss_channel
};
DECLARE_CHANNEL_SET(standard_photo_gloss_black);
@@ -693,6 +762,41 @@ static const escp2_inkname_t f360_two_color_grayscale_inkset =
/*
****************************************************************
* *
+ * Three shade gray *
+ * *
+ ****************************************************************
+ */
+
+static const ink_channel_t *const photo3_black_channels[] =
+{
+ &photo3_black_channel
+};
+
+DECLARE_CHANNEL_SET(photo3_black);
+
+static const escp2_inkname_t three_color_grayscale_inkset =
+{
+ "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
+ &photo3_black_channel_set
+};
+
+static const ink_channel_t *const f360_photo3_black_channels[] =
+{
+ &f360_photo3_black_channel
+};
+
+DECLARE_CHANNEL_SET(f360_photo3_black);
+
+static const escp2_inkname_t f360_three_color_grayscale_inkset =
+{
+ "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
+ &f360_photo3_black_channel_set
+};
+
+
+/*
+ ****************************************************************
+ * *
* Quadtone gray *
* *
****************************************************************
@@ -887,6 +991,19 @@ static const escp2_inkname_t three_color_r800_composite_inkset =
&r800_cmy_channel_set
};
+static const ink_channel_t *const r2400_cmy_channels[] =
+{
+ NULL, &standard_cyan_channel,
+ &f360_standard_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(r2400_cmy);
+
+static const escp2_inkname_t three_color_r2400_composite_inkset =
+{
+ "CMY", N_("Three Color Composite"), INKSET_CMYK,
+ &r2400_cmy_channel_set
+};
/*
****************************************************************
@@ -938,9 +1055,23 @@ static const escp2_inkname_t four_color_r800_matte_inkset =
&r800_cmyk_channel_set
};
+static const ink_channel_t *const r2400_cmyk_channels[] =
+{
+ &f360_black_channel, &standard_cyan_channel,
+ &f360_standard_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(r2400_cmyk);
+
+static const escp2_inkname_t four_color_r2400_standard_inkset =
+{
+ "CMYK", N_("Four Color Standard"), INKSET_CMYK,
+ &r2400_cmyk_channel_set
+};
+
static const ink_channel_t *const photo_gloss_cmyk_channels[] =
{
- &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+ &f360_photo_black_channel, &f360_standard_cyan_channel,
&standard_magenta_channel, &f360_standard_yellow_channel,
&standard_gloss_channel
};
@@ -949,7 +1080,7 @@ DECLARE_CHANNEL_SET(photo_gloss_cmyk);
static const ink_channel_t *const r800_photo_cmyk_channels[] =
{
- &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+ &f360_photo_black_channel, &f360_standard_cyan_channel,
&standard_magenta_channel, &f360_standard_yellow_channel,
};
@@ -1069,6 +1200,20 @@ static const escp2_inkname_t f360_five_color_photo_composite_inkset =
&f360_photo_composite_channel_set
};
+static const ink_channel_t *const five_color_photo3_channels[] =
+{
+ NULL, &f360x_photo_cyan_channel,
+ &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(five_color_photo3);
+
+static const escp2_inkname_t five_color_photo3_inkset =
+{
+ "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
+ &five_color_photo3_channel_set
+};
+
/*
****************************************************************
@@ -1094,7 +1239,7 @@ static const escp2_inkname_t six_color_photo_inkset =
static const ink_channel_t *const f360_photo_channels[] =
{
- &f360_photo_black_channel, &f360_photo_cyan_channel,
+ &standard_black_channel, &f360_photo_cyan_channel,
&f360_photo_magenta_channel, &f360_photo_yellow_channel
};
@@ -1106,6 +1251,19 @@ static const escp2_inkname_t f360_six_color_photo_inkset =
&f360_photo_channel_set
};
+static const ink_channel_t *const six_color_photo3_channels[] =
+{
+ &f360_black_channel, &f360x_photo_cyan_channel,
+ &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(six_color_photo3);
+
+static const escp2_inkname_t six_color_photo3_inkset =
+{
+ "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
+ &six_color_photo3_channel_set
+};
/*
****************************************************************
@@ -1180,6 +1338,20 @@ static const escp2_inkname_t f360_seven_color_enhanced_inkset =
&f360_photo2_channel_set
};
+static const ink_channel_t *const seven_color_photo3_channels[] =
+{
+ &f360_photo2_black_channel, &f360x_photo_cyan_channel,
+ &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(seven_color_photo3);
+
+static const escp2_inkname_t seven_color_photo3_inkset =
+{
+ "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
+ &seven_color_photo3_channel_set
+};
+
/*
****************************************************************
* *
@@ -1204,7 +1376,7 @@ static const escp2_inkname_t j_seven_color_enhanced_inkset =
static const ink_channel_t *const f360_photoj_channels[] =
{
- &f360_photo_black_channel, &f360_photo_cyan_channel,
+ &standard_black_channel, &f360_photo_cyan_channel,
&f360_photo_magenta_channel, &f360_photo2_yellow_channel
};
@@ -1220,6 +1392,29 @@ static const escp2_inkname_t f360_j_seven_color_enhanced_inkset =
/*
****************************************************************
* *
+ * Eight color CcMmYKkk *
+ * *
+ ****************************************************************
+ */
+
+static const ink_channel_t *const photo3_channels[] =
+{
+ &f360_photo3_black_channel, &f360x_photo_cyan_channel,
+ &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(photo3);
+
+static const escp2_inkname_t eight_color_enhanced_inkset =
+{
+ "PhotoCMYK8", N_("Eight Color Photo"), INKSET_CcMmYKk,
+ &photo3_channel_set
+};
+
+
+/*
+ ****************************************************************
+ * *
* Five color CMYRB *
* *
****************************************************************
@@ -1298,7 +1493,7 @@ static const escp2_inkname_t six_color_r800_inkset =
static const ink_channel_t *const six_color_r800_photo_channels[] =
{
- &f360_r800_photo_black_channel, &r800_cyan_channel,
+ &f360_photo_black_channel, &r800_cyan_channel,
&r800_magenta_channel, &r800_yellow_channel,
&r800_red_channel, &r800_blue_channel
};
@@ -1313,7 +1508,7 @@ static const escp2_inkname_t six_color_r800_photo_inkset =
static const ink_channel_t *const six_color_r800_photo_gloss_channels[] =
{
- &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+ &f360_photo_black_channel, &f360_standard_cyan_channel,
&r800_magenta_channel, &r800_yellow_channel,
&r800_red_channel, &r800_blue_channel,
&standard_gloss_channel
@@ -1376,7 +1571,7 @@ static const escp2_inkname_t two_color_extended_inkset =
static const ink_channel_t *const f360_two_color_extended_channels[] =
{
- &f360_photo_black_channel, &extended_black_channel
+ &standard_black_channel, &extended_black_channel
};
DECLARE_CHANNEL_SET(f360_two_color_extended);
@@ -1603,7 +1798,7 @@ static const escp2_inkname_t six_color_r800_extended_inkset =
static const ink_channel_t *const f360_six_color_extended_channels[] =
{
- &f360_photo_black_channel,
+ &standard_black_channel,
&f360_standard_cyan_channel, &extended_cyan_channel,
&f360_standard_magenta_channel, &extended_magenta_channel,
&f360_photo_yellow_channel
@@ -1654,7 +1849,7 @@ static const escp2_inkname_t seven_color_extended_inkset =
static const ink_channel_t *const f360_seven_color_extended_channels[] =
{
- &f360_photo_black_channel, &extended_black_channel,
+ &standard_black_channel, &extended_black_channel,
&f360_standard_cyan_channel, &extended_cyan_channel,
&f360_standard_magenta_channel, &extended_magenta_channel,
&f360_photo_yellow_channel
@@ -1670,7 +1865,7 @@ static const escp2_inkname_t f360_seven_color_extended_inkset =
static const ink_channel_t *const seven_color_r800_gloss_extended_channels[] =
{
- &standard_black_channel, &f360_r800_photo_black_channel,
+ &standard_black_channel, &f360_photo_black_channel,
&r800_cyan_channel, &r800_magenta_channel,
&r800_yellow_channel, &r800_red_channel,
&r800_blue_channel, &standard_gloss_channel
@@ -1685,6 +1880,23 @@ static const escp2_inkname_t seven_color_r800_gloss_extended_inkset =
};
+static const ink_channel_t *const eight_color_extended_channels[] =
+{
+ &f360_black_channel, &extended_black_channel,
+ &f360_extended_photo3_black_channel,
+ &standard_cyan_channel, &f360_extended_cyan_channel,
+ &f360_standard_magenta_channel, &extended_magenta_channel,
+ &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(eight_color_extended);
+
+static const escp2_inkname_t eight_color_extended_inkset =
+{
+ "PhysicalCMYKkk", N_("Eight Color Raw"), INKSET_EXTENDED,
+ &eight_color_extended_channel_set
+};
+
static const shade_set_t standard_shades =
{
@@ -1725,8 +1937,8 @@ static const shade_set_t photo_gen2_shades = /* Stylus 870 and newer */
static const shade_set_t photo_gen3_shades = /* Stylus R300 and newer */
{
{ 1, { 1.0 }},
- { 2, { 1.0, 0.3 }},
- { 2, { 1.0, 0.3 }},
+ { 2, { 1.0, 0.35 }},
+ { 2, { 1.0, 0.35 }},
{ 1, { 1.0 }},
{ 1, { 1.0 }},
{ 1, { 1.0 }},
@@ -1782,6 +1994,30 @@ static const shade_set_t ultrachrome_matte_shades = /* Ultrachrome with matte bl
{ 1, { 1.0 }},
};
+static const shade_set_t ultra3_photo_shades = /* R2400 with photo black ink */
+{
+ { 3, { 1.0, 0.555, 0.185 }},
+ { 2, { 1.0, 0.25 }},
+ { 2, { 1.0, 0.25 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+};
+
+static const shade_set_t ultra3_matte_shades = /* R2400 with matte black ink */
+{
+ { 3, { 1.0, 0.278, 0.093 }},
+ { 2, { 1.0, 0.25 }},
+ { 2, { 1.0, 0.25 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+ { 1, { 1.0 }},
+};
+
static const shade_set_t quadtone_shades = /* Some kind of quadtone ink */
{
{ 4, { 1.0, 0.75, 0.5, 0.25 }},
@@ -2038,6 +2274,25 @@ DECLARE_INKLIST("ultramatte", ultra_matte7, photo7,
N_("UltraChrome Matte Black"), ultrachrome,
ultrachrome_matte, ultrachrome_matte);
+static const escp2_inkname_t *const f360_photo8_ink_types[] =
+{
+ &eight_color_enhanced_inkset,
+ &seven_color_photo3_inkset,
+ &six_color_photo3_inkset,
+ &five_color_photo3_inkset,
+ &four_color_r2400_standard_inkset,
+ &three_color_r2400_composite_inkset,
+ &eight_color_extended_inkset,
+};
+
+DECLARE_INKLIST("ultra3photo", f360_ultra_photo8, f360_photo8,
+ N_("Photo Black"), ultrachrome_k3,
+ ultrachrome_k3_photo, ultra3_photo);
+
+DECLARE_INKLIST("ultra3matte", f360_ultra_matte8, f360_photo8,
+ N_("Matte Black"), ultrachrome_k3,
+ ultrachrome_k3_matte, ultra3_matte);
+
static const escp2_inkname_t *const cmykrb_matte_ink_types[] =
{
&six_color_r800_inkset,
@@ -2203,6 +2458,14 @@ static const inklist_t *const ultrachrome_group[] =
DECLARE_INKGROUP(ultrachrome);
+static const inklist_t *const f360_ultrachrome_k3_group[] =
+{
+ &f360_ultra_photo8_inklist,
+ &f360_ultra_matte8_inklist
+};
+
+DECLARE_INKGROUP(f360_ultrachrome_k3);
+
static const inklist_t *const cmykrb_group[] =
{
&cmykrb_photo_inklist,
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index 6b26b7f..eaffd03 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-inks.c,v 1.41 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.42 2005/10/23 19:43:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -127,6 +127,20 @@ static const escp2_dropsize_t escp2_r300_2880_dropsizes =
static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
{ "r300_2880_1440", 1, { 1.0 } };
+/* Stylus Photo R2400 */
+static const escp2_dropsize_t escp2_r2400_360_dropsizes =
+ { "r2400_360", 1, { 1 } };
+static const escp2_dropsize_t escp2_r2400_720_dropsizes =
+ { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_1440_dropsizes =
+ { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_dropsizes =
+ { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_1440_dropsizes =
+ { "r2400_2880_1440", 2, { 0.41, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_2880_dropsizes =
+ { "r2400_2880_2880", 1, { 1.0 } };
+
/* Stylus C80 */
static const escp2_dropsize_t escp2_economy_pigment_dropsizes =
{ "economy_pigment", 3, { 0, 0, 1.0 } };
@@ -275,6 +289,19 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
&escp2_r300_2880_1440_dropsizes,
};
+const escp2_drop_list_t stpi_escp2_variable_r2400_drops =
+{
+ &escp2_r2400_360_dropsizes,
+ &escp2_r2400_360_dropsizes,
+ &escp2_r2400_720_dropsizes,
+ &escp2_r2400_720_dropsizes,
+ &escp2_r2400_1440_dropsizes,
+ &escp2_r2400_2880_dropsizes,
+ &escp2_r2400_2880_1440_dropsizes,
+ &escp2_r2400_2880_2880_dropsizes,
+ &escp2_r2400_2880_2880_dropsizes,
+};
+
const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
{
&escp2_1_5pl_360_dropsizes,
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 24a6e92..3980be0 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-papers.c,v 1.80 2005/08/14 14:55:22 rleigh Exp $"
+ * "$Id: escp2-papers.c,v 1.84 2005/10/30 00:57:40 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -141,12 +141,12 @@ static const char photo3_lum_adj[] =
"<gutenprint>\n"
"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */ "0.60 0.61 0.64 0.68 0.73 0.78 0.82 0.85 " /* B */
-/* B */ "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 " /* M */
+/* C */ "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 " /* B */
+/* B */ "0.91 0.88 0.82 0.78 0.78 0.80 0.82 0.85 " /* M */
/* M */ "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 " /* R */
/* R */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* Y */
/* Y */ "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 " /* G */
-/* G */ "0.84 0.72 0.68 0.66 0.64 0.62 0.61 0.60 " /* C */
+/* G */ "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 " /* C */
"</sequence>\n"
"</curve>\n"
"</gutenprint>\n";
@@ -349,6 +349,97 @@ static const char ultra_glossy_hue_adj[] =
"</gutenprint>\n";
+static const char ultra_k3_matte_sat_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */ "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 " /* B */
+/* B */ "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 " /* M */
+/* M */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* R */
+/* R */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* Y */
+/* Y */ "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 " /* G */
+/* G */ "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_matte_lum_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */ "0.49 0.51 0.55 0.61 0.67 0.71 0.76 0.79 " /* B */
+/* B */ "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 " /* M */
+/* M */ "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 " /* R */
+/* R */ "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 " /* Y */
+/* Y */ "1.00 0.98 0.97 0.95 0.93 0.91 0.88 0.83 " /* G */
+/* G */ "0.75 0.64 0.58 0.54 0.52 0.51 0.50 0.49 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_matte_hue_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */ "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 " /* B */
+/* B */ "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 " /* M */
+/* M */ "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 " /* R */
+/* R */ "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 " /* Y */
+/* Y */ "0.00 -.00 -.03 -.07 -.11 -.15 -.17 -.18 " /* G */
+/* G */ "-.19 -.20 -.19 -.18 -.16 -.12 -.08 -.04 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_sat_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */ "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 " /* B */
+/* B */ "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 " /* M */
+/* M */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* R */
+/* R */ "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 " /* Y */
+/* Y */ "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 " /* G */
+/* G */ "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_lum_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */ "0.49 0.53 0.60 0.64 0.67 0.69 0.72 0.75 " /* B */
+/* B */ "0.75 0.71 0.70 0.70 0.72 0.76 0.81 0.87 " /* M */
+/* M */ "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 " /* R */
+/* R */ "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 " /* Y */
+/* Y */ "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 " /* G */
+/* G */ "0.83 0.69 0.61 0.55 0.53 0.52 0.50 0.49 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_hue_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */ "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 " /* B */
+/* B */ "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 " /* M */
+/* M */ "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 " /* R */
+/* R */ "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 " /* Y */
+/* Y */ "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 " /* G */
+/* G */ "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 " /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+
static const char r800_matte_sat_adj[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<gutenprint>\n"
@@ -590,43 +681,43 @@ DECLARE_PAPER_ADJUSTMENTS(photo2);
static const paper_adjustment_t photo3_adjustments[] =
{
- { "Plain", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Plain", 0.615, .35, 0.75, .15, .9, 1, .7, .8, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "PlainFast", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "PlainFast", 0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Postcard", 0.83, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Postcard", 0.692, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "GlossyFilm", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Transparency", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Envelope", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+ { "Envelope", 0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "BackFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "BackFilm", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Matte", 0.85, .35, 0.75, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Matte", 0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "MatteHeavy", 0.85, .35, .3, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "MatteHeavy", 0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Inkjet", 0.85, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+ { "Inkjet", 0.709, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Coated", 1.2, .35, .5, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Coated", 0.833, .45, 0.5, .25, .999, 1, .76, .84, .66, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Photo", 1.00, .35, 0.5, .3, .999, 1, .59, .7, .9, 1, 1,
+ { "Photo", 0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyPhoto", 1.0, .25, 0.5, .3, .999, 1, .6, .83, .66, 1, 0.85,
+ { "GlossyPhoto", 0.833, .75, 0.5, .25, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Semigloss", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+ { "Semigloss", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Luster", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+ { "Luster", 0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "GlossyPaper", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "GlossyPaper", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Ilford", .85, .25, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+ { "Ilford", 0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "ColorLife", 1.00, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+ { "ColorLife", 0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
- { "Other", 0.738, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
+ { "Other", 0.615, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
};
@@ -770,6 +861,100 @@ static const paper_adjustment_t ultrachrome_matte_adjustments[] =
DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
+static const paper_adjustment_t ultrachrome_k3_photo_adjustments[] =
+{
+ { "Plain", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Postcard", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Transparency", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Envelope", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Coated", 0.83, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Photo", 1.0, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyPhoto", 0.72, 1, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "Luster", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Other", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
+
+static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
+{
+ { "Plain", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "PlainFast", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Postcard", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Transparency", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Envelope", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "BackFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "MatteHeavy", 0.92, 0.4, .4, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Inkjet", 0.72, .3, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Coated", 0.83, .4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Photo", 1.0, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyPhoto", 0.72, 1, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, .5, .92,
+ ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+ { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "GlossyPaper", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Ilford", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "ColorLife", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+ { "Other", 0.72, .1, .4, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+ ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_matte);
+
static const paper_adjustment_t r800_photo_adjustments[] =
{
{ "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
@@ -1096,6 +1281,54 @@ static const paper_t ultrachrome_papers[] =
DECLARE_PAPERS(ultrachrome);
+static const paper_t ultrachrome_k3_papers[] =
+{
+ { "Plain", N_("Plain Paper"), PAPER_PLAIN,
+ 1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+ { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
+ 5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+ { "Postcard", N_("Postcard"), PAPER_PLAIN,
+ 2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+ { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
+ 3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
+ { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
+ 3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "Envelope", N_("Envelopes"), PAPER_PLAIN,
+ 4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+ { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
+ 6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
+ { "Matte", N_("Matte Paper"), PAPER_GOOD,
+ 7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+ { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
+ 7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+ { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
+ 7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+ { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
+ 7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
+ { "Photo", N_("Photo Paper"), PAPER_PHOTO,
+ 8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
+ 8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
+ 8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
+ 8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
+ 7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+ { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
+ 7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+ { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
+ 6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
+ { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
+ 8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
+ { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
+ 8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
+ { "Other", N_("Other"), PAPER_PLAIN,
+ 0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+};
+
+DECLARE_PAPERS(ultrachrome_k3);
+
static const paper_t durabrite2_papers[] =
{
{ "Plain", N_("Plain Paper"), PAPER_PLAIN,
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 011e2ef..419cf48 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
/*
- * "$Id: escp2-resolutions.c,v 1.28 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.29 2005/10/23 19:43:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -106,6 +106,9 @@ static const res_t r_1440x720sw =
static const res_t r_1440x720hq2 =
{ "1440x720hq2", N_("1440 x 720 DPI Highest Quality"),
1440, 720, 1440, 720, 1, 0, 2 };
+static const res_t r_720x1440sw =
+{ "720x1440sw", N_("1440 x 720 DPI Transposed"),
+ 720, 1440, 720, 1440, 1, 0, 1 };
static const res_t r_2880x720mw =
{ "2880x720mw", N_("2880 x 720 DPI"),
@@ -133,6 +136,9 @@ static const res_t r_2880x1440mw =
static const res_t r_2880x1440sw =
{ "2880x1440sw", N_("2880 x 1440 DPI"),
2880, 1440, 2880, 1440, 1, 0, 1};
+static const res_t r_1440x2880sw =
+{ "1440x2880sw", N_("2880 x 1440 DPI Transposed"),
+ 1440, 2880, 1440, 2880, 1, 0, 1};
static const res_t r_2880x2880mw =
{ "2880x2880mw", N_("2880 x 2880 DPI"),
@@ -243,12 +249,14 @@ const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
&r_720sw,
&r_1440x720sw,
+ &r_720x1440sw,
&r_2880x720sw,
&r_1440x1440sw,
&r_2880x1440sw,
+ &r_1440x2880sw,
&r_2880x2880sw,
@@ -296,10 +304,12 @@ const res_t *const stpi_escp2_superfine_reslist[] =
&r_720sw,
&r_1440x720sw,
+ &r_720x1440sw,
&r_1440x1440ov,
&r_2880x1440sw,
+ &r_1440x2880sw,
&r_2880x2880sw,
diff --git a/src/main/path.c b/src/main/path.c
index 86e131b..d59c625 100644
--- a/src/main/path.c
+++ b/src/main/path.c
@@ -1,5 +1,5 @@
/*
- * "$Id: path.c,v 1.17 2004/09/17 18:38:21 rleigh Exp $"
+ * "$Id: path.c,v 1.18 2005/10/18 02:08:17 rlk Exp $"
*
* Gutenprint path functions - split and search paths.
*
@@ -63,7 +63,7 @@ stp_path_search(stp_list_t *dirlist, /* List of directories to search */
{
stp_list_t *findlist; /* List of files to return */
stp_list_item_t *diritem; /* Current directory */
- struct dirent** module_dir; /* Current directory contents */
+ struct dirent** module_dir = NULL; /* Current directory contents */
char *module_name; /* File name to check */
int n; /* Number of directory entries */
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index a0d2dcb..53b56b0 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-canon.c,v 1.163 2005/08/25 23:40:40 rlk Exp $"
+ * "$Id: print-canon.c,v 1.167 2005/10/21 13:31:41 faust3 Exp $"
*
* Print plug-in CANON BJL driver for the GIMP.
*
@@ -55,7 +55,7 @@
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
-
+#include <math.h>
/* Solaris with gcc has problems because gcc's limits.h doesn't #define */
/* this */
#ifndef CHAR_BIT
@@ -763,6 +763,18 @@ typedef struct
int bits;
int ydpi;
color_info_t color_info[9]; /* C,M,Y,K,c,m,y,k,? */
+ int ncolors; /* number of colors to print with */
+ int physical_xdpi, nozzle_ydpi, stepper_ydpi;
+ int nozzles; /* count of inkjets for one pass */
+ int nozzle_separation;
+ int horizontal_passes;
+ int vertical_passes;
+ int vertical_oversample;
+ int *head_offset;
+ int last_pass_offset;
+ int bidirectional; /* tells us if we are allowed to print bidirectional */
+ int direction; /* stores the last direction of the print head */
+
} canon_privdata_t;
static void canon_write_line(stp_vars_t *v);
@@ -805,8 +817,12 @@ static void canon_write_line(stp_vars_t *v);
#define CANON_CAP_r 0x800ul
#define CANON_CAP_g 0x1000ul
#define CANON_CAP_ACKSHORT 0x2000ul
-#define CANON_CAP_extended_t 0x4000ul /* detailed level and bitdepth settings for every ink*/
-#define CANON_CAP_5pixelin1byte 0x8000ul /* 5 pixel with 3 levels in 1 byte compression */
+#define CANON_CAP_rr 0x4000ul
+#define CANON_CAP_WEAVE 0x8000ul /* S200 has to be fed with weaved data */
+ /* for Resolutions above 360dpi */
+#define CANON_CAP_extended_t 0x10000ul /* detailed level and bitdepth settings for every ink*/
+#define CANON_CAP_5pixelin1byte 0x20000ul /* 5 pixel with 3 levels in 1 byte compression */
+#define CANON_CAP_DUPLEX 0x40000ul
#define CANON_CAP_STD0 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|\
CANON_CAP_l|CANON_CAP_q|CANON_CAP_t)
@@ -894,6 +910,27 @@ static const canon_cap_t canon_model_capabilities[] =
/* */
/* ************************************ */
+ { /* Canon S200x *//* heads: BC-24 */
+ 4202, 3,
+ 618, 936, /* 8.58" x 13 " */
+ 180, 2880, 2880, 4,
+ 10, 10, 9, 20,
+ CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+ CANON_SLOT_ASF1,
+ CANON_CAP_STD1 | CANON_CAP_rr | CANON_CAP_WEAVE,
+ CANON_MODES(canon_nomodes),
+#ifndef EXPERIMENTAL_STUFF
+/* 2880dpi Resolutions: TBD */
+/* 180x180 360x360 720x720 1440x720 1440x1440 2880x2880 */
+ {-1, 0, 0, 0, 0, -1},
+/*------- 360x360 720x720 1440x720 1440x1440 ---------*/
+ { 1, 2, 1, 0.5, 0.3, 0.2},
+ CANON_INK(canon_ink_standard),
+#endif
+ standard_lum_adjustment,
+ standard_hue_adjustment,
+ standard_sat_adjustment
+ },
{ /* Canon BJ 30 *//* heads: BC-10 */
30, 1,
@@ -1304,7 +1341,7 @@ static const canon_cap_t canon_model_capabilities[] =
11, 9, 10, 18, /*border_left, border_right, border_top, border_bottom */
CANON_INK_CMYK /*| CANON_INK_CcMmYyK*/, /*canon inks */
CANON_SLOT_ASF1, /*paper slot */
- CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte, /*features */
+ CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte|CANON_CAP_DUPLEX, /*features */
CANON_MODES(canon_nomodes),
#ifndef EXPERIMENTAL_STUFF
{-1,0,0,-1,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
@@ -1375,10 +1412,12 @@ typedef struct {
typedef struct {
const canon_cap_t *caps;
int printing_color;
+ int is_first_page;
const paper_t *pt;
int print_head;
int colormode;
const char *source_str;
+ const char *duplex_str;
int xdpi;
int ydpi;
int page_width;
@@ -1406,6 +1445,8 @@ static const paper_t canon_paper_list[] = {
};
static const int paper_type_count = sizeof(canon_paper_list) / sizeof(paper_t);
+static void canon_advance_paper(stp_vars_t *, int);
+static void canon_flush_pass(stp_vars_t *, int, int);
static const stp_parameter_t the_parameters[] =
{
@@ -1451,6 +1492,12 @@ static const stp_parameter_t the_parameters[] =
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
},
+ {
+ "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
+ N_("Duplex/Tumble Setting"),
+ STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+ STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+ }
};
static const int the_parameter_count =
@@ -1529,6 +1576,24 @@ static const float_param_t float_parameters[] =
static const int float_parameter_count =
sizeof(float_parameters) / sizeof(const float_param_t);
+/*
+ * Duplex support - modes available
+ * Note that the internal names MUST match those in cups/genppd.c else the
+ * PPD files will not be generated correctly
+ *
+ * TODO: Support for DuplexNoTumble, the image has to be rotated
+ */
+
+static const stp_param_string_t duplex_types[] =
+{
+ { "None", N_ ("Off") },
+/* { "DuplexNoTumble", N_ ("Long Edge (Standard)") } , */
+ { "DuplexTumble", N_ ("Short Edge (Flip)") }
+};
+#define NUM_DUPLEX (sizeof (duplex_types) / sizeof (stp_param_string_t))
+
+
+
static const paper_t *
get_media_type(const char *name)
{
@@ -1566,6 +1631,8 @@ canon_source_type(const char *name, const canon_cap_t * caps)
if (!strcmp(name,"Auto")) return 4;
if (!strcmp(name,"Manual")) return 0;
if (!strcmp(name,"ManualNP")) return 1;
+ if (!strcmp(name,"Cassette")) return 8;
+ if (!strcmp(name,"CD")) return 10;
}
stp_deprintf(STP_DBG_CANON,"canon: Unknown source type '%s' - reverting to auto\n",name);
@@ -1833,7 +1900,9 @@ static const stp_param_string_t media_sources[] =
{
{ "Auto", N_ ("Auto Sheet Feeder") },
{ "Manual", N_ ("Manual with Pause") },
- { "ManualNP", N_ ("Manual without Pause") }
+ { "ManualNP", N_ ("Manual without Pause") },
+ { "Cassette", N_ ("Cassette") },
+ { "CD", N_ ("CD tray") }
};
@@ -1989,7 +2058,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
}
else if (strcmp(name, "InputSlot") == 0)
{
- int count = 3;
+ int count = sizeof(media_sources)/sizeof(media_sources[0]);
description->bounds.str= stp_string_list_create();
description->deflt.str= media_sources[0].name;
for (i = 0; i < count; i ++)
@@ -2006,6 +2075,36 @@ canon_parameters(const stp_vars_t *v, const char *name,
(description->bounds.str, "BW", _("Black and White"));
description->deflt.str =
stp_string_list_param(description->bounds.str, 0)->name;
+ }
+ else if (strcmp(name, "Duplex") == 0)
+ {
+ int offer_duplex=0;
+
+ description->bounds.str = stp_string_list_create();
+
+/*
+ * Don't offer the Duplex/Tumble options if the JobMode parameter is
+ * set to "Page" Mode.
+ * "Page" mode is set by the Gimp Plugin, which only outputs one page at a
+ * time, so Duplex/Tumble is meaningless.
+ */
+
+ if (stp_get_string_parameter(v, "JobMode"))
+ offer_duplex = strcmp(stp_get_string_parameter(v, "JobMode"), "Page");
+ else
+ offer_duplex=1;
+
+ if (offer_duplex && (caps->features & CANON_CAP_DUPLEX))
+ {
+ description->deflt.str = duplex_types[0].name;
+ for (i=0; i < NUM_DUPLEX; i++)
+ {
+ stp_string_list_add_string(description->bounds.str,
+ duplex_types[i].name,_(duplex_types[i].text));
+ }
+ }
+ else
+ description->is_active = 0;
}
}
@@ -2136,6 +2235,20 @@ canon_init_resetPrinter(const stp_vars_t *v, canon_init_t *init)
canon_cmd(v,ESC5b,0x4b, 2, 0x00,0x0f);
}
+/* ESC ($ -- 0x24 -- cmdSetDuplex --:
+ */
+static void
+canon_init_setDuplex(const stp_vars_t *v, canon_init_t *init)
+{
+ if (!(init->caps->features & CANON_CAP_DUPLEX))
+ return;
+ if (strncmp(init->duplex_str, "Duplex", 6))
+ return;
+ /* The same command seems to be needed for both Duplex and DuplexTumble
+ no idea about the meanings of the single bytes */
+ canon_cmd(v,ESC28,0x24,9,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x02);
+}
+
/* ESC (a -- 0x61 -- cmdSetPageMode --:
*/
static void
@@ -2165,13 +2278,13 @@ static void
canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
{
unsigned char
- arg_63_1, arg_63_2, arg_63_3;
-
+ numargs, arg_63[6];
if (!(init->caps->features & CANON_CAP_c))
return;
- arg_63_1 = init->caps->model_id << 4; /* MODEL_ID */
+ numargs = 3;
+ arg_63[0] = init->caps->model_id << 4; /* MODEL_ID */
switch ( init->caps->model_id ) {
@@ -2180,12 +2293,12 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
case 1: /* 360 dpi series - BJC-4000, BJC-210, BJC-70 and their descendants */
if (!init->printing_color)
- arg_63_1|= 0x01; /* PRINT_COLOUR */
+ arg_63[0]|= 0x01; /* PRINT_COLOUR */
- arg_63_2 = ((init->pt ? init->pt->media_code : 0) << 4) /* PRINT_MEDIA */
+ arg_63[1] = ((init->pt ? init->pt->media_code : 0) << 4) /* PRINT_MEDIA */
+ 1; /* hardcode to High quality for now */ /* PRINT_QUALITY */
- canon_cmd(v,ESC28,0x63, 2, arg_63_1, arg_63_2);
+ canon_cmd(v,ESC28,0x63, 2, arg_63[0], arg_63[1]);
break;
case 2: /* are any models using this? */
@@ -2193,13 +2306,32 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
case 3: /* 720 dpi series - BJC-3000 and descendants */
if (!init->printing_color)
- arg_63_1|= 0x01; /* colour mode */
-
- arg_63_2 = (init->pt) ? init->pt->media_code : 0; /* print media type */
-
- arg_63_3 = 2; /* hardcode to whatever this means for now */ /* quality, apparently */
-
- canon_cmd(v,ESC28,0x63, 3, arg_63_1, arg_63_2, arg_63_3);
+ arg_63[0]|= 0x01; /* colour mode */
+
+ arg_63[1] = (init->pt) ? init->pt->media_code : 0; /* print media type */
+
+ if (init->caps->model == 4202) /* S200 */
+ {
+ if ((init->xdpi == 720) && (init->ydpi == 720 ))
+ arg_63[2] = 1;
+ else
+ arg_63[2] = 4; /* hardcoded: quality 3 (may be 0...4) */
+ /* bidirectional is controlled via quality: 0..2 is bidi, 3 and 4 uni */
+ /* not every combination works, no idea about the principle */
+ if ( (init->xdpi > 360) || (init->ydpi > 360) )
+ {
+ numargs = 6;
+ arg_63[3] = 0x10; arg_63[4] = 6; arg_63[5] = 8; /* arg5 makes a vert. offset for K */
+ if (!init->printing_color)
+ arg_63[4] = 1;
+ }
+ }
+ else
+ arg_63[2] = 2; /* hardcode to whatever this means for now; quality, apparently */
+
+ stp_zprintf(v, "\033\050\143");
+ stp_put16_le(numargs, v);
+ stp_zfwrite((const char *)arg_63, numargs, 1, v);
break;
}
@@ -2214,10 +2346,20 @@ canon_init_setResolution(const stp_vars_t *v, canon_init_t *init)
if (!(init->caps->features & CANON_CAP_d))
return;
+ if (init->caps->model != 4202 || (init->xdpi <= 360))
canon_cmd(v,ESC28,0x64, 4,
(init->ydpi >> 8 ), (init->ydpi & 255),
(init->xdpi >> 8 ), (init->xdpi & 255));
-}
+ else
+ if (init->xdpi < 2880)
+ canon_cmd(v,ESC28,0x64, 4,
+ (720 >> 8), (720 & 255),
+ (720 >> 8), (720 & 255));
+ else
+ canon_cmd(v,ESC28,0x64, 4,
+ (720 >> 8), (720 & 255),
+ (2880 >> 8), (2880 & 255));
+ }
/* ESC (g -- 0x67 -- cmdSetPageMargins --:
*/
@@ -2266,8 +2408,12 @@ canon_init_setTray(const stp_vars_t *v, canon_init_t *init)
arg_6c_1|= (source & 0x0f);
if (init->pt) arg_6c_2= init->pt->media_code;
-
- canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
+ if (!strcmp("CD",init->source_str)) {
+ stp_deprintf(STP_DBG_CANON,"canon: sending special cd setTray command\n");
+ canon_cmd(v,ESC28,0x6c, 3, 0x3a,0x12,0);
+ } else {
+ canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
+ }
}
/* ESC (m -- 0x6d -- -- :
@@ -2278,7 +2424,8 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
unsigned char
arg_6d_1 = 0x03, /* color printhead? */
arg_6d_2 = 0x00, /* 00=color 02=b/w */
- arg_6d_3 = 0x00, /* only 01 for bjc8200 */
+ arg_6d_3 = 0x00, /* only 01 for bjc8200 and S200*/
+ /* S200:for envelope and t-shirt transfer = 03 */
arg_6d_a = 0x03, /* A4 paper */
arg_6d_b = 0x00;
@@ -2298,7 +2445,7 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
if (!init->printing_color)
arg_6d_2= 0x02;
- if (init->caps->model==8200)
+ if (init->caps->model==8200 || init->caps->model==4202)
arg_6d_3= 0x01;
canon_cmd(v,ESC28,0x6d,12, arg_6d_1,
@@ -2326,10 +2473,15 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_init_t *init)
if (!(init->caps->features & CANON_CAP_p))
return;
-
- canon_cmd(v,ESC28,0x70, 8,
- arg_70_1, arg_70_2, 0x00, 0x00,
- arg_70_3, arg_70_4, 0x00, 0x00);
+ if (!strcmp(init->source_str,"CD")) {
+ canon_cmd(v,ESC28,0x70, 8, 0x00, 0x2a, 0xb0, 0x00,
+ 0x00, 0x01, 0xe0, 0x00);
+ stp_deprintf(STP_DBG_CANON,"sending cd margins\n");
+ } else {
+ canon_cmd(v,ESC28,0x70, 8,
+ arg_70_1, arg_70_2, 0x00, 0x00,
+ arg_70_3, arg_70_4, 0x00, 0x00);
+ }
}
/* ESC (q -- 0x71 -- setPageID -- :
@@ -2348,10 +2500,24 @@ canon_init_setPageID(const stp_vars_t *v, canon_init_t *init)
static void
canon_init_setX72(const stp_vars_t *v, canon_init_t *init)
{
- if (!(init->caps->features & CANON_CAP_r))
+ if ( !( (init->caps->features & CANON_CAP_r)
+ || (init->caps->features & CANON_CAP_rr) ) )
return;
- canon_cmd(v,ESC28,0x72, 1, 0x61); /* whatever for - 8200 needs it */
+ if ( (init->caps->features & CANON_CAP_r)
+ || (init->caps->features & CANON_CAP_rr) )
+ canon_cmd(v,ESC28,0x72, 1, 0x61); /* whatever for - 8200/S200 need it */
+ if (init->caps->features & CANON_CAP_rr)
+ canon_cmd(v,ESC28,0x72, 3, 0x63, 1, 0); /* whatever for - S200 needs it */
+ /* probably to set the print direction of the head */
+}
+
+/* ESC (r -- 0x72 -- ??? set direction ??? -- :
+ only works if quality = 01 (S200) */
+static void
+canon_set_X72(const stp_vars_t *v, int x72arg)
+{
+ canon_cmd(v,ESC28,0x72, 3, 0x63, x72arg, 0);
}
/* ESC (t -- 0x74 -- cmdSetImage --:
@@ -2366,7 +2532,15 @@ canon_init_setImage(const stp_vars_t *v, canon_init_t *init)
if (!(init->caps->features & CANON_CAP_t))
return;
-
+ if (init->caps->model==4202) /* 1 bit per pixel (arg 4,7,10,13); */
+ /* 2 level per pixel (arg 6,9,12,15) for each color */
+ /* though we print only 1bit/pixel - but this is how */
+ /* the windows driver works */
+ {
+ canon_cmd(v,ESC28,0x74, 30, 0x80, 4, 1, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2,\
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ return;
+ }
if(init->caps->features & CANON_CAP_extended_t)
{
unsigned char buf[30] = {0x80,0x80,0x1,};
@@ -2412,8 +2586,10 @@ canon_init_printer(const stp_vars_t *v, canon_init_t *init)
{
int mytop;
/* init printer */
-
- canon_init_resetPrinter(v,init); /* ESC [K */
+ if (init->is_first_page) {
+ canon_init_resetPrinter(v,init); /* ESC [K */
+ canon_init_setDuplex(v,init); /* ESC ($ */
+ }
canon_init_setPageMode(v,init); /* ESC (a */
canon_init_setDataCompression(v,init); /* ESC (b */
canon_init_setPageID(v,init); /* ESC (q */
@@ -2555,6 +2731,57 @@ set_color_info(const canon_cap_t * caps,const canon_variable_ink_t* ink,color_in
set_bit_info(caps,small);
}
+static void
+set_mask(unsigned char *cd_mask, int x_center, int scaled_x_where,
+ int limit, int expansion, int invert)
+{
+ int clear_val = invert ? 255 : 0;
+ int set_val = invert ? 0 : 255;
+ int bytesize = 8 / expansion;
+ int byteextra = bytesize - 1;
+ int first_x_on = x_center - scaled_x_where;
+ int first_x_off = x_center + scaled_x_where;
+ if (first_x_on < 0)
+ first_x_on = 0;
+ if (first_x_on > limit)
+ first_x_on = limit;
+ if (first_x_off < 0)
+ first_x_off = 0;
+ if (first_x_off > limit)
+ first_x_off = limit;
+ first_x_on += byteextra;
+ if (first_x_off > (first_x_on - byteextra))
+ {
+ int first_x_on_byte = first_x_on / bytesize;
+ int first_x_on_mod = expansion * (byteextra - (first_x_on % bytesize));
+ int first_x_on_extra = ((1 << first_x_on_mod) - 1) ^ clear_val;
+ int first_x_off_byte = first_x_off / bytesize;
+ int first_x_off_mod = expansion * (byteextra - (first_x_off % bytesize));
+ int first_x_off_extra = ((1 << 8) - (1 << first_x_off_mod)) ^ clear_val;
+ if (first_x_off_byte < first_x_on_byte)
+ {
+ /* This can happen, if 6 or fewer points are turned on */
+ cd_mask[first_x_on_byte] = first_x_on_extra & first_x_off_extra;
+ }
+ else
+ {
+ if (first_x_on_extra != clear_val)
+
+ cd_mask[first_x_on_byte - 1] = first_x_on_extra;
+ if (first_x_off_byte > first_x_on_byte)
+ memset(cd_mask + first_x_on_byte, set_val,
+ first_x_off_byte - first_x_on_byte);
+ if (first_x_off_extra != clear_val)
+ cd_mask[first_x_off_byte] = first_x_off_extra;
+ }
+ }
+}
+
+
+#define CD_X_OFFSET 0
+#define CD_Y_OFFSET 230
+#define CD_OUTER_RADIUS (329/2)
+#define CD_INNER_RADIUS 56
/*
* 'canon_print()' - Print an image to a CANON printer.
*/
@@ -2567,6 +2794,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
const char *resolution = stp_get_string_parameter(v, "Resolution");
const char *media_source = stp_get_string_parameter(v, "InputSlot");
const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
+ const char *duplex_mode =stp_get_string_parameter(v, "Duplex");
+ int page_number = stp_get_int_parameter(v, "PageNumber");
+
int printing_color = 0;
const char *ink_type = stp_get_string_parameter(v, "InkType");
int top = stp_get_top(v);
@@ -2598,7 +2828,12 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
image_width;
int res_code;
int use_6color= 0;
+ int print_cd= (media_source && (!strcmp(media_source, "CD")));
double k_upper, k_lower;
+ unsigned char *cd_mask = NULL;
+ double outer_r_sq = 0;
+ double inner_r_sq = 0;
+
stp_curve_t *lum_adjustment = NULL;
stp_curve_t *hue_adjustment = NULL;
stp_curve_t *sat_adjustment = NULL;
@@ -2677,16 +2912,25 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
internal_imageable_area(v, 0, &page_left, &page_right,
&page_bottom, &page_top);
- left -= page_left;
- top -= page_top;
- page_width = page_right - page_left;
- page_height = page_bottom - page_top;
-
+ if (print_cd) {
+ left += CD_X_OFFSET;
+ top += CD_Y_OFFSET;
+ /*page_width = CD_OUTER_RADIUS*2;
+ page_height = CD_OUTER_RADIUS*2; */
+ stp_default_media_size(v, &page_width, &page_height);
+ out_width = page_width;
+ out_height = page_height;
+ } else {
+ left -= page_left;
+ top -= page_top;
+ page_width = page_right - page_left;
+ page_height = page_bottom - page_top;
+ }
image_height = stp_image_height(image);
image_width = stp_image_width(image);
stp_default_media_size(v, &n, &page_true_height);
-
+
PUT("top ",top,72);
PUT("left ",left,72);
PUT("page_true_height",page_true_height,72);
@@ -2704,6 +2948,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
init.print_head = printhead;
init.colormode = colormode;
init.source_str = media_source;
+ init.duplex_str = duplex_mode;
+ init.is_first_page = (page_number == 0);
init.xdpi = xdpi;
init.ydpi = ydpi;
init.page_width = page_width;
@@ -2752,7 +2998,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
for (i = 0; i < 7; i++)
privdata.cols[i] = NULL;
- if(xdpi==1440){
+ if((xdpi == 1440) && (model != 4202)){
privdata.delay[0] = 0;
privdata.delay[1] = 112;
privdata.delay[2] = 224;
@@ -2762,6 +3008,16 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
privdata.delay[6] = 336;
privdata.delay_max = 336;
stp_deprintf(STP_DBG_CANON,"canon: delay on!\n");
+ } else if (model ==4202 ){
+ privdata.delay[0]= 0;
+ privdata.delay[1]= 0x30;
+ privdata.delay[2]= 0x50;
+ privdata.delay[3]= 0x70;
+ privdata.delay[4]= 0;
+ privdata.delay[5]= 0;
+ privdata.delay[6]= 0;
+ privdata.delay_max= 0x70;
+ stp_deprintf(STP_DBG_CANON,"canon: delay for S200 on!\n");
} else {
for (i = 0; i < 7; i++)
privdata.delay[i] = 0;
@@ -2788,7 +3044,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
}
}
- privdata.buf_length = length * max_bits;
+ /* buffer length + 1 extra byte for offset data that might get added in canon_write */
+ privdata.buf_length = length * max_bits + 1;
privdata.length = length;
privdata.left = left;
privdata.bits = bits;
@@ -2922,6 +3179,91 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
(v, STP_ECOLOR_K, 0,
get_double_param(v, "BlackDensity") * get_double_param(v, "Density"));
+ /* initialize weaving for S200 for resolutions > 360dpi */
+ if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+ {
+ privdata.stepper_ydpi = 720;
+ privdata.nozzle_ydpi = 360;
+ if (xdpi == 2880)
+ privdata.physical_xdpi = 2880;
+ else
+ privdata.physical_xdpi = 720;
+
+ stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: old=%d,\n", privdata.left);
+ privdata.left = (int)( (float)privdata.left * (float)privdata.physical_xdpi / (float)xdpi ); /* adjust left margin */
+ stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: new=%d,\n", privdata.left);
+
+ privdata.ncolors = 4;
+ privdata.head_offset = stp_zalloc(sizeof(int) * privdata.ncolors);
+ memset(privdata.head_offset, 0, sizeof(privdata.head_offset));
+
+ if ( colormode == COLOR_MONOCHROME )
+ privdata.nozzles = 64; /* black nozzles */
+ else
+ privdata.nozzles = 24; /* color nozzles */
+ if (colormode == COLOR_MONOCHROME)
+ {
+ privdata.ncolors = 1;
+ privdata.head_offset[0] = 0; /* K starts at 0 */
+ privdata.head_offset[1] = 0 ;/* how far C starts after K */
+ privdata.head_offset[2] = 0;/* how far M starts after K */
+ privdata.head_offset[3] = 0;/* how far Y starts after K */
+ top += 11;
+ }
+ else if (colormode == COLOR_CMYK)
+ {
+ privdata.head_offset[0] = 0; /* K starts at 0 */
+ privdata.head_offset[1] = 144 ;/* how far C starts after K */
+ privdata.head_offset[2] = 144 + 64;/* how far M starts after K */
+ privdata.head_offset[3] = 144 + 64 + 64;/* how far Y starts after K */
+ top += 5;
+ }
+ else /* colormode == CMY */
+ {
+ privdata.head_offset[0] = 0; /* K starts at 0 */
+ privdata.head_offset[1] = 0 ;/* how far C starts after K */
+ privdata.head_offset[2] = 64;/* how far M starts after K */
+ privdata.head_offset[3] = 128;/* how far Y starts after K */
+ top += 18;
+ }
+
+ privdata.nozzle_separation = privdata.stepper_ydpi / privdata.nozzle_ydpi;
+ privdata.horizontal_passes = xdpi / privdata.physical_xdpi;
+ privdata.vertical_passes = 1;
+ privdata.vertical_oversample = privdata.ydpi / privdata.stepper_ydpi;
+ privdata.bidirectional = 1; /* 1: bidirectional; 0: unidirectional printing */
+ privdata.direction = 1;
+ stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
+ stp_deprintf(STP_DBG_CANON,"canon: initializing weaving: nozzles=%d, nozzle_separation=%d,\n"
+ "horizontal_passes=%d, vertical_passes=%d,vertical_oversample=%d,\n"
+ "ncolors=%d, out_width=%d, out_height=%d\n"
+ "weave_top=%d, weave_page_height=%d \n"
+ "head_offset=[%d,%d,%d,%d] \n",
+ privdata.nozzles, privdata.nozzle_separation,
+ privdata.horizontal_passes, privdata.vertical_passes,
+ privdata.vertical_oversample, privdata.ncolors,
+ out_width, out_height,
+ top * privdata.stepper_ydpi / 72, page_height * privdata.stepper_ydpi / 72,
+ privdata.head_offset[0],privdata.head_offset[1],
+ privdata.head_offset[2],privdata.head_offset[3]);
+
+ stp_initialize_weave(v, privdata.nozzles, privdata.nozzle_separation,
+ privdata.horizontal_passes, privdata.vertical_passes,
+ privdata.vertical_oversample, privdata.ncolors,
+ 1,
+ out_width, out_height,
+ top * privdata.stepper_ydpi / 72,
+ page_height * privdata.stepper_ydpi / 72,
+ privdata.head_offset,
+ STP_WEAVE_ZIGZAG,
+ canon_flush_pass,
+ stp_fill_uncompressed,
+ stp_pack_uncompressed,
+ stp_compute_uncompressed_linewidth);
+ privdata.last_pass_offset = 0;
+ }
+
+
errdiv = image_height / out_height;
errmod = image_height % out_height;
errval = 0;
@@ -2960,6 +3302,11 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
privdata.emptylines = 0;
+ if (print_cd) {
+ cd_mask = stp_malloc(1 + (out_width + 7) / 8);
+ outer_r_sq = (double)CD_OUTER_RADIUS * (double)CD_OUTER_RADIUS;
+ inner_r_sq = (double)CD_INNER_RADIUS * (double)CD_INNER_RADIUS;
+ }
for (y = 0; y < out_height; y ++)
{
int duplicate_line = 1;
@@ -2974,9 +3321,36 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
break;
}
}
-
- stp_dither(v, y, duplicate_line, zero_mask, NULL);
- canon_printfunc(v);
+ if (print_cd)
+ {
+ int x_center = CD_OUTER_RADIUS * xdpi / 72;
+ int y_distance_from_center =
+ CD_OUTER_RADIUS - (y * 72 / ydpi);
+ if (y_distance_from_center < 0)
+ y_distance_from_center = -y_distance_from_center;
+ memset(cd_mask, 0, (out_width + 7) / 8);
+ if (y_distance_from_center < CD_OUTER_RADIUS)
+ {
+ double y_sq = (double) y_distance_from_center *
+ (double) y_distance_from_center;
+ int x_where = sqrt(outer_r_sq - y_sq) + .5;
+ int scaled_x_where = x_where * xdpi / 72;
+ set_mask(cd_mask, x_center, scaled_x_where,
+ out_width, 1, 0);
+ if (y_distance_from_center < CD_INNER_RADIUS)
+ {
+ x_where = sqrt(inner_r_sq - y_sq) + .5;
+ scaled_x_where = x_where * ydpi / 72;
+ set_mask(cd_mask, x_center, scaled_x_where,
+ out_width, 1, 1);
+ }
+ }
+ }
+ stp_dither(v, y, duplicate_line, zero_mask, cd_mask);
+ if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+ stp_write_weave(v, privdata.cols);
+ else
+ canon_printfunc(v);
errval += errmod;
errline += errdiv;
if (errval >= out_height)
@@ -2986,6 +3360,14 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
}
}
+ if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+ {
+ stp_flush_all(v);
+ canon_advance_paper(v, 5);
+ }
+ else
+ {
+
/*
* Flush delayed buffers...
*/
@@ -3001,7 +3383,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
privdata.delay[i]);
}
}
-
+ }
stp_image_conclude(image);
/*
@@ -3011,6 +3393,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
for (i = 0; i < 7; i++)
if (privdata.cols[i])
stp_free(privdata.cols[i]);
+
+ if(cd_mask)
+ stp_free(cd_mask);
canon_deinit_printer(v, &init);
return status;
@@ -3247,22 +3632,31 @@ canon_write(stp_vars_t *v, /* I - Print file or command */
if (line[0] == 0 && memcmp(line, line + 1, length - 1) == 0)
return 0;
+ offset2 = offset / 8;
+ bitoffset = offset % 8;
+
/* fold lsb/msb pairs if drop modulation is active */
if (bits==2) {
+ int pixels_per_byte = 4;
+ if((caps->features & CANON_CAP_5pixelin1byte) && (pd->color_info[coloridx].level == 3))
+ pixels_per_byte = 5;
stp_fold(line,length,in_fold);
in_ptr= in_fold;
length= (length*8/4); /* 4 pixels in 8bit */
- offset= (offset*8/4); /* 4 pixels in 8bit */
+ /* calculate the number of compressed bytes that can be sent directly */
+ offset2 = offset / pixels_per_byte;
+ /* calculate the number of (uncompressed) bits that have to be added to the raster data */
+ bitoffset = (offset % pixels_per_byte) * 2;
}
if (bits==3) {
memset(in_fold,0,length);
canon_fold_3bit(line,length,in_fold);
in_ptr= in_fold;
length= (length*8)/3;
- offset= (offset/3)*8;
+ offset2 = offset/3;
#if 0
switch(offset%3){
case 0: offset= (offset/3)*8; break;
@@ -3270,12 +3664,11 @@ canon_write(stp_vars_t *v, /* I - Print file or command */
case 2: offset= (offset/3)*8/*+5 CAREFUL! CANNOT SHIFT _AFTER_ RECODING!!*/; break;
}
#endif
+ bitoffset= 0;
}
/* pack left border rounded to multiples of 8 dots */
comp_data= comp_buf;
- offset2= offset/8;
- bitoffset= offset%8;
while (offset2>0) {
unsigned char toffset = offset2 > 128 ? 128 : offset2;
comp_data[0] = 1 - toffset;
@@ -3285,7 +3678,15 @@ canon_write(stp_vars_t *v, /* I - Print file or command */
}
if (bitoffset) {
if (bitoffset<8)
- canon_shift_buffer(in_ptr,length,bitoffset);
+ {
+ in_ptr[ length++ ] = 0;
+ canon_shift_buffer(in_ptr,length,bitoffset);
+ }
+ else if (bitoffset == 8)
+ {
+ memmove(in_ptr + 1,in_ptr,length++);
+ in_ptr[0] = 0;
+ }
else
stp_deprintf(STP_DBG_CANON,"SEVERE BUG IN print-canon.c::canon_write() "
"bitoffset=%d!!\n",bitoffset);
@@ -3349,6 +3750,98 @@ canon_write_line(stp_vars_t *v)
pd->emptylines += 1;
}
+static void
+canon_advance_paper(stp_vars_t *v, int advance)
+{
+ if ( advance > 0 )
+ {
+ int a0, a1, a2, a3;
+ stp_deprintf(STP_DBG_CANON," --advance paper %d\n", advance);
+ a0 = advance & 0xff;
+ a1 = (advance >> 8) & 0xff;
+ a2 = (advance >> 16) & 0xff;
+ a3 = (advance >> 24) & 0xff;
+ stp_zprintf(v, "\033(e%c%c%c%c%c%c", 4, 0, a3, a2, a1, a0);
+ }
+}
+
+static void
+canon_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
+{
+ stp_lineoff_t *lineoffs = stp_get_lineoffsets_by_pass(v, passno);
+ stp_lineactive_t *lineactive = stp_get_lineactive_by_pass(v, passno);
+ const stp_linebufs_t *bufs = stp_get_linebases_by_pass(v, passno);
+ stp_pass_t *pass = stp_get_pass_by_pass(v, passno);
+ stp_linecount_t *linecount = stp_get_linecount_by_pass(v, passno);
+ canon_privdata_t *pd = (canon_privdata_t *) stp_get_component_data(v, "Driver");
+ int papershift = (pass->logicalpassstart - pd->last_pass_offset);
+
+ int color, line, written = 0, linelength = 0, lines = 0;
+ int idx[4]={3, 0, 1, 2}; /* color numbering is different between canon_write and weaving */
+
+ stp_deprintf(STP_DBG_CANON,"canon_flush_pass: ----pass=%d,---- \n", passno);
+ (pd->emptylines) = 0;
+
+ for ( color = 0; color < pd->ncolors; color++ ) /* find max. linecount */
+ {
+ if ( linecount[0].v[color] > lines )
+ lines = linecount[0].v[color];
+ }
+
+ for ( line = 0; line < lines; line++ ) /* go through each nozzle f that pass */
+ {
+ stp_deprintf(STP_DBG_CANON," --line=%d\n", line);
+
+ if ( written > 0 )
+ canon_cmd(v,ESC28,0x65, 2, 0, 1); /* go to next nozzle*/
+ /* if there was printed some data */
+
+ written = 0;
+ for ( color = 0; color < pd->ncolors; color++ )
+ {
+ if ( line < linecount[0].v[color] ) /* try only existing lines */
+ {
+ if ( lineactive[0].v[color] > 0 )
+ {
+ linelength = lineoffs[0].v[color] / linecount[0].v[color];
+/* stp_deprintf(STP_DBG_CANON,"canon_flush_pass: linelength=%d, bufs[0].v[color]=%p,"
+ "bufs[0].v[color]+line * linelength=%p, empty=%d \n", linelength, bufs[0].v[color],
+ bufs[0].v[color] + line * linelength, (pd->emptylines));
+*/
+ if ( pass->logicalpassstart - pd->last_pass_offset > 0 )
+ {
+ canon_advance_paper(v, papershift);
+ pd->last_pass_offset = pass->logicalpassstart;
+ if (pd->bidirectional)
+ {
+ pd->direction = (pd->direction +1) & 1;
+ canon_set_X72(v, pd->direction);
+ stp_deprintf(STP_DBG_CANON," --set direction %d\n", pd->direction);
+ }
+ }
+
+ written += canon_write(v, pd->caps,
+ (unsigned char *)(bufs[0].v[color] + line * linelength),
+ linelength, idx[color], pd->ydpi,
+ &(pd->emptylines), pd->out_width,
+ pd->left, pd->bits);
+ if (written) stp_deprintf(STP_DBG_CANON," --written color %d,\n", color);
+
+ }
+ }
+ }
+
+ if ( written == 0 ) /* count unused nozzles */
+ (pd->emptylines) += 1;
+ }
+
+ for ( color = 0; color < pd->ncolors; color++ )
+ {
+ lineoffs[0].v[color] = 0;
+ linecount[0].v[color] = 0;
+ }
+ stp_deprintf(STP_DBG_CANON," --ended-- with empty=%d \n", (pd->emptylines));
+}
static stp_family_t print_canon_module_data =
{
diff --git a/src/main/print-color.c b/src/main/print-color.c
index b6ebb71..c7c6574 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-color.c,v 1.131 2005/07/04 00:23:54 rlk Exp $"
+ * "$Id: print-color.c,v 1.132 2005/09/17 21:54:33 rlk Exp $"
*
* Gutenprint color management module - traditional Gutenprint algorithm.
*
@@ -156,6 +156,7 @@ typedef struct
double defval;
unsigned channel_mask;
int color_only;
+ int is_rgb;
} float_param_t;
#define RAW_GAMMA_CHANNEL(channel) \
@@ -165,7 +166,7 @@ typedef struct
N_("Gamma for raw channel " #channel), \
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT, \
STP_PARAMETER_LEVEL_INTERNAL, 0, 1, channel, 1, 0 \
- }, 0.1, 4.0, 1.0, CMASK_RAW, 0 \
+ }, 0.1, 4.0, 1.0, CMASK_RAW, 0, -1 \
}
static const float_param_t float_parameters[] =
@@ -176,7 +177,7 @@ static const float_param_t float_parameters[] =
N_("Color correction to be applied"),
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
- }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+ }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
},
{
{
@@ -184,7 +185,7 @@ static const float_param_t float_parameters[] =
N_("Bit depth per channel"),
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
- }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+ }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
},
{
{
@@ -192,7 +193,7 @@ static const float_param_t float_parameters[] =
N_("Input image type"),
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
- }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+ }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
},
{
{
@@ -200,7 +201,7 @@ static const float_param_t float_parameters[] =
N_("Output image type"),
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
STP_PARAMETER_LEVEL_INTERNAL, 1, 1, -1, 1, 0
- }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+ }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
},
{
{
@@ -208,7 +209,15 @@ static const float_param_t float_parameters[] =
N_("Raw Channels"),
STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_CORE,
STP_PARAMETER_LEVEL_INTERNAL, 1, 1, -1, 1, 0
- }, 1.0, STP_CHANNEL_LIMIT, 1.0, CMASK_EVERY, 0
+ }, 1.0, STP_CHANNEL_LIMIT, 1.0, CMASK_EVERY, 0, -1
+ },
+ {
+ {
+ "SimpleGamma", N_("SimpleGamma"), N_("Gamma"),
+ N_("Do not correct for screen gamma"),
+ STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_OUTPUT,
+ STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0
+ }, 0.0, 1.0, 0.0, CMASK_EVERY, 0, -1
},
{
{
@@ -216,7 +225,7 @@ static const float_param_t float_parameters[] =
N_("Brightness of the print"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
- }, 0.0, 2.0, 1.0, CMASK_ALL, 0
+ }, 0.0, 2.0, 1.0, CMASK_ALL, 0, -1
},
{
{
@@ -224,7 +233,7 @@ static const float_param_t float_parameters[] =
N_("Contrast of the print (0 is solid gray)"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_ALL, 0
+ }, 0.0, 4.0, 1.0, CMASK_ALL, 0, -1
},
{
{
@@ -232,7 +241,7 @@ static const float_param_t float_parameters[] =
N_("Use linear vs. fixed end point contrast adjustment"),
STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED3, 1, 1, -1, 1, 0
- }, 0.0, 0.0, 0.0, CMASK_ALL, 0
+ }, 0.0, 0.0, 0.0, CMASK_ALL, 0, -1
},
{
{
@@ -242,7 +251,7 @@ static const float_param_t float_parameters[] =
"values will produce a generally darker print. "),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, -1, 1, 0
- }, 0.1, 4.0, 1.0, CMASK_EVERY, 0
+ }, 0.1, 4.0, 1.0, CMASK_EVERY, 0, -1
},
{
{
@@ -250,7 +259,7 @@ static const float_param_t float_parameters[] =
N_("Gamma value assumed by application"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0
- }, 0.1, 4.0, 1.0, CMASK_EVERY, 0
+ }, 0.1, 4.0, 1.0, CMASK_EVERY, 0, -1
},
{
{
@@ -258,7 +267,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the cyan gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_C, 1
+ }, 0.0, 4.0, 1.0, CMASK_C, 1, 0
},
{
{
@@ -266,7 +275,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the magenta gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_M, 1
+ }, 0.0, 4.0, 1.0, CMASK_M, 1, 0
},
{
{
@@ -274,7 +283,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the yellow gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_Y, 1
+ }, 0.0, 4.0, 1.0, CMASK_Y, 1, 0
},
{
{
@@ -282,7 +291,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the red gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
- }, 0.0, 1.0, 1.0, CMASK_R, 1
+ }, 0.0, 4.0, 1.0, CMASK_C, 1, 1
},
{
{
@@ -290,7 +299,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the green gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_G, 1
+ }, 0.0, 4.0, 1.0, CMASK_M, 1, 1
},
{
{
@@ -298,7 +307,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the blue gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_B, 1
+ }, 0.0, 4.0, 1.0, CMASK_Y, 1, 1
},
{
{
@@ -306,7 +315,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the black gamma"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
- }, 0.0, 4.0, 1.0, CMASK_K, 1
+ }, 0.0, 4.0, 1.0, CMASK_K, 1, 0
},
{
{
@@ -314,7 +323,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the cyan gray balance"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
- }, 0.0, 1.0, 1.0, CMASK_C, 1
+ }, 0.0, 1.0, 1.0, CMASK_C, 1, 0
},
{
{
@@ -322,7 +331,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the magenta gray balance"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
- }, 0.0, 1.0, 1.0, CMASK_M, 1
+ }, 0.0, 1.0, 1.0, CMASK_M, 1, 0
},
{
{
@@ -330,7 +339,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the yellow gray balance"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
- }, 0.0, 1.0, 1.0, CMASK_Y, 1
+ }, 0.0, 1.0, 1.0, CMASK_Y, 1, 0
},
{
{
@@ -340,7 +349,7 @@ static const float_param_t float_parameters[] =
"using color and black inks"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
- }, 0.0, 9.0, 1.0, CMASK_CMY | CMASK_RGB, 1
+ }, 0.0, 9.0, 1.0, CMASK_CMY | CMASK_RGB, 1, 0
},
/* Need to think this through a bit more -- rlk 20030712 */
{
@@ -349,7 +358,7 @@ static const float_param_t float_parameters[] =
N_("Limit the total ink printed to the page"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 0, 0
- }, 0.0, STP_CHANNEL_LIMIT, STP_CHANNEL_LIMIT, CMASK_CMY, 0
+ }, 0.0, STP_CHANNEL_LIMIT, STP_CHANNEL_LIMIT, CMASK_CMY, 0, -1
},
{
{
@@ -357,7 +366,7 @@ static const float_param_t float_parameters[] =
N_("Adjust the gray component transition rate"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
- }, 0.0, 1.0, 1.0, CMASK_K, 1
+ }, 0.0, 1.0, 1.0, CMASK_K, 1, 0
},
{
{
@@ -365,7 +374,7 @@ static const float_param_t float_parameters[] =
N_("Lower bound of gray component reduction"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
- }, 0.0, 1.0, 0.2, CMASK_K, 1
+ }, 0.0, 1.0, 0.2, CMASK_K, 1, 0
},
{
{
@@ -373,7 +382,7 @@ static const float_param_t float_parameters[] =
N_("Upper bound of gray component reduction"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
- }, 0.0, 5.0, 0.5, CMASK_K, 1
+ }, 0.0, 5.0, 0.5, CMASK_K, 1, 0
},
RAW_GAMMA_CHANNEL(0),
RAW_GAMMA_CHANNEL(1),
@@ -419,6 +428,7 @@ typedef struct
unsigned channel_mask;
int hsl_only;
int color_only;
+ int is_rgb;
} curve_param_t;
static int standard_curves_initialized = 0;
@@ -437,7 +447,7 @@ static stp_curve_t *gcr_curve_bounds = NULL;
N_("Output Curves"), N_("Curve for raw channel " #channel), \
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT, \
STP_PARAMETER_LEVEL_INTERNAL, 0, 1, channel, 1, 0 \
- }, &color_curve_bounds, CMASK_RAW, 0, 0 \
+ }, &color_curve_bounds, CMASK_RAW, 0, 0, -1 \
}
static curve_param_t curve_parameters[] =
@@ -448,7 +458,7 @@ static curve_param_t curve_parameters[] =
N_("Cyan curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
- }, &color_curve_bounds, CMASK_C, 0, 1
+ }, &color_curve_bounds, CMASK_C, 0, 1, 0
},
{
{
@@ -456,7 +466,7 @@ static curve_param_t curve_parameters[] =
N_("Magenta curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 2, 1, 0
- }, &color_curve_bounds, CMASK_M, 0, 1
+ }, &color_curve_bounds, CMASK_M, 0, 1, 0
},
{
{
@@ -464,7 +474,7 @@ static curve_param_t curve_parameters[] =
N_("Yellow curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 3, 1, 0
- }, &color_curve_bounds, CMASK_Y, 0, 1
+ }, &color_curve_bounds, CMASK_Y, 0, 1, 0
},
{
{
@@ -472,7 +482,7 @@ static curve_param_t curve_parameters[] =
N_("Black curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 0, 1, 0
- }, &color_curve_bounds, CMASK_K, 0, 0
+ }, &color_curve_bounds, CMASK_K, 0, 0, 0
},
{
{
@@ -480,23 +490,23 @@ static curve_param_t curve_parameters[] =
N_("Red curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
- }, &color_curve_bounds, CMASK_R, 0, 1
+ }, &color_curve_bounds, CMASK_C, 0, 1, 1
},
{
{
"GreenCurve", N_("Green Curve"), N_("Output Curves"),
N_("Green curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
- STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
- }, &color_curve_bounds, CMASK_G, 0, 1
+ STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 2, 1, 0
+ }, &color_curve_bounds, CMASK_M, 0, 1, 1
},
{
{
"BlueCurve", N_("Blue Curve"), N_("Output Curves"),
N_("Blue curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
- STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
- }, &color_curve_bounds, CMASK_B, 0, 1
+ STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 3, 1, 0
+ }, &color_curve_bounds, CMASK_Y, 0, 1, 1
},
{
{
@@ -504,7 +514,7 @@ static curve_param_t curve_parameters[] =
N_("White curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
- }, &color_curve_bounds, CMASK_W, 0, 0
+ }, &color_curve_bounds, CMASK_W, 0, 0, 1
},
{
{
@@ -512,7 +522,7 @@ static curve_param_t curve_parameters[] =
N_("Hue adjustment curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
- }, &hue_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+ }, &hue_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
},
{
{
@@ -520,7 +530,7 @@ static curve_param_t curve_parameters[] =
N_("Saturation adjustment curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
- }, &sat_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+ }, &sat_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
},
{
{
@@ -528,7 +538,7 @@ static curve_param_t curve_parameters[] =
N_("Luminosity adjustment curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
- }, &lum_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+ }, &lum_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
},
{
{
@@ -536,7 +546,7 @@ static curve_param_t curve_parameters[] =
N_("Gray component reduction curve"),
STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, 0, 1, 0
- }, &gcr_curve_bounds, CMASK_K, 0, 1
+ }, &gcr_curve_bounds, CMASK_K, 0, 1, -1
},
RAW_CURVE_CHANNEL(0),
RAW_CURVE_CHANNEL(1),
@@ -681,6 +691,7 @@ allocate_lut(void)
ret->app_gamma = 1.0;
ret->contrast = 1.0;
ret->brightness = 1.0;
+ ret->simple_gamma_correction = 0;
return ret;
}
@@ -721,6 +732,7 @@ copy_lut(void *vlut)
dest->screen_gamma = src->screen_gamma;
dest->contrast = src->contrast;
dest->brightness = src->brightness;
+ dest->simple_gamma_correction = src->simple_gamma_correction;
dest->linear_contrast_adjustment = src->linear_contrast_adjustment;
stp_curve_cache_copy(&(dest->hue_map), &(src->hue_map));
stp_curve_cache_copy(&(dest->lum_map), &(src->lum_map));
@@ -818,7 +830,7 @@ compute_gcr_curve(const stp_vars_t *vars)
}
static void
-initialize_gcr_curve(const stp_vars_t *vars)
+initialize_gcr_curve(stp_vars_t *vars)
{
lut_t *lut = (lut_t *)(stp_get_component_data(vars, "Color"));
stp_curve_t *curve = NULL;
@@ -840,7 +852,7 @@ initialize_gcr_curve(const stp_vars_t *vars)
}
else
curve = compute_gcr_curve(vars);
- stp_channel_set_gcr_curve((stp_vars_t *)vars, curve);
+ stp_channel_set_gcr_curve(vars, curve);
if (curve)
stp_curve_destroy(curve);
}
@@ -1085,6 +1097,33 @@ compute_a_curve_fast(lut_t *lut, int channel)
stp_free(tmp);
}
+static void
+compute_a_curve_simple(lut_t *lut, int channel)
+{
+ double *tmp;
+ stp_curve_t *curve = stp_curve_cache_get_curve(&(lut->channel_curves[channel]));
+ int i;
+ int isteps = lut->steps;
+ double gamma = 1.0 / (lut->gamma_values[channel] * lut->print_gamma);
+ if (isteps > 256)
+ isteps = 256;
+ tmp = stp_malloc(sizeof(double) * lut->steps);
+ for (i = 0; i < isteps; i++)
+ {
+ double pixel = (double) i / (double) (isteps - 1);
+ if (lut->input_color_description->color_model == COLOR_BLACK)
+ pixel = 1.0 - pixel;
+ pixel = pow(pixel, gamma);
+ if (lut->output_color_description->color_model == COLOR_BLACK)
+ pixel = 1.0 - pixel;
+ tmp[i] = floor((65535.0 * pixel) + 0.5);
+ }
+ stp_curve_set_data(curve, isteps, tmp);
+ if (isteps != lut->steps)
+ stp_curve_resample(curve, lut->steps);
+ stp_free(tmp);
+}
+
/*
* If the input and output color spaces both have a particular channel,
* we want to use the general algorithm. If not (i. e. we have to
@@ -1095,6 +1134,8 @@ compute_a_curve(lut_t *lut, int channel)
{
if (channel_is_synthesized(lut, channel))
compute_a_curve_fast(lut, channel);
+ else if (lut->simple_gamma_correction)
+ compute_a_curve_simple(lut, channel);
else
compute_a_curve_full(lut, channel);
}
@@ -1143,7 +1184,8 @@ compute_one_lut(lut_t *lut, int i)
STP_CURVE_BOUNDS_RESCALE);
if (stp_curve_is_piecewise(curve))
stp_curve_resample(curve, lut->steps);
- invert_curve(curve, invert_output);
+ if (lut->invert_output)
+ invert_curve(curve, invert_output);
stp_curve_resample(curve, lut->steps);
}
else
@@ -1201,6 +1243,7 @@ stpi_compute_lut(stp_vars_t *v)
lut->app_gamma = 1.0;
lut->contrast = 1.0;
lut->brightness = 1.0;
+ lut->simple_gamma_correction = 0;
if (stp_check_boolean_parameter(v, "LinearContrast", STP_PARAMETER_DEFAULTED))
lut->linear_contrast_adjustment =
@@ -1214,6 +1257,8 @@ stpi_compute_lut(stp_vars_t *v)
if (stp_check_float_parameter(v, "AppGamma", STP_PARAMETER_ACTIVE))
lut->app_gamma = stp_get_float_parameter(v, "AppGamma");
+ if (stp_check_boolean_parameter(v, "SimpleGamma", STP_PARAMETER_ACTIVE))
+ lut->simple_gamma_correction = stp_get_boolean_parameter(v, "SimpleGamma");
lut->screen_gamma = lut->app_gamma / 4.0; /* "Empirical" */
curve = stp_curve_create_copy(color_curve_bounds);
stp_curve_rescale(curve, 65535.0, STP_CURVE_COMPOSE_MULTIPLY,
@@ -1448,6 +1493,11 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
get_color_description(stp_describe_output(v));
if (color_description &&
(param->channel_mask & color_description->channels) &&
+ (param->is_rgb < 0 ||
+ (param->is_rgb == 0 &&
+ color_description->color_model == COLOR_BLACK) ||
+ (param->is_rgb == 1 &&
+ color_description->color_model == COLOR_WHITE)) &&
param->channel_mask != CMASK_RAW)
description->is_active = 1;
else
@@ -1570,6 +1620,11 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
const color_description_t *color_description =
get_color_description(stp_describe_output(v));
if (color_description &&
+ (param->is_rgb < 0 ||
+ (param->is_rgb == 0 &&
+ color_description->color_model == COLOR_BLACK) ||
+ (param->is_rgb == 1 &&
+ color_description->color_model == COLOR_WHITE)) &&
(param->channel_mask & color_description->channels))
description->is_active = 1;
else
diff --git a/src/main/print-dither-matrices.c b/src/main/print-dither-matrices.c
index a301fb0..b7fa06a 100644
--- a/src/main/print-dither-matrices.c
+++ b/src/main/print-dither-matrices.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-dither-matrices.c,v 1.34 2004/09/17 18:38:22 rleigh Exp $"
+ * "$Id: print-dither-matrices.c,v 1.35 2005/10/23 19:43:14 rlk Exp $"
*
* Print plug-in driver utility functions for the GIMP.
*
@@ -171,19 +171,27 @@ stp_dither_matrix_init_from_dither_array(stp_dither_matrix_impl_t *mat,
stp_array_get_size(array, &x_size, &y_size);
vec = stp_sequence_get_ushort_data(seq, &count);
- mat->base = x_size;;
+ mat->base = x_size;
mat->exp = 1;
- mat->x_size = x_size;
- mat->y_size = y_size;
+ if (transpose)
+ {
+ mat->x_size = y_size;
+ mat->y_size = x_size;
+ }
+ else
+ {
+ mat->x_size = x_size;
+ mat->y_size = y_size;
+ }
mat->total_size = mat->x_size * mat->y_size;
mat->matrix = stp_malloc(sizeof(unsigned) * mat->x_size * mat->y_size);
- for (x = 0; x < mat->x_size; x++)
- for (y = 0; y < mat->y_size; y++)
+ for (x = 0; x < x_size; x++)
+ for (y = 0; y < y_size; y++)
{
if (transpose)
- mat->matrix[x + y * mat->x_size] = vec[y + x * mat->y_size];
+ mat->matrix[y + x * y_size] = vec[x + y * x_size];
else
- mat->matrix[x + y * mat->x_size] = vec[x + y * mat->x_size];
+ mat->matrix[x + y * x_size] = vec[x + y * x_size];
}
mat->last_x = mat->last_x_mod = 0;
mat->last_y = mat->last_y_mod = 0;
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 7d7191e..ac20bc4 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2-data.c,v 1.178 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.181 2005/10/29 21:31:19 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -81,6 +81,9 @@ static const escp2_dot_size_t c2pl_dotsizes =
static const escp2_dot_size_t c1_8pl_dotsizes =
{ 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13 };
+static const escp2_dot_size_t p3_5pl_dotsizes =
+{ 0x10, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12 };
+
static const escp2_dot_size_t sc440_dotsizes =
{ 3, 3, 2, 1, -1, -1, -1, -1, -1 };
@@ -211,7 +214,7 @@ static const escp2_base_resolutions_t pro_base_res =
* 8: 5760x2880
*/
-/* 0 1 2 3 4 5 6 7 */
+/* 0 1 2 3 4 5 6 7 8 */
static const escp2_densities_t g1_densities =
{ 2.6, 1.3, 1.3, 0.568, 0.0, 0.0, 0.0, 0.0, 0.0 };
@@ -241,11 +244,14 @@ static const escp2_densities_t c3pl_densities =
{ 2.6, 1.3, 0.65, 0.730, 0.7, 0.91, 0.455, 0.0, 0.0 };
static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0, 1.00, 0.815, 0.788, 0.821, 0.680, 0.340, 0.0 };
+{ 4.0, 2.0, 1.00, 0.679, 0.657, 0.684, 0.566, 0.283, 0.0 };
static const escp2_densities_t p1_5pl_densities =
{ 2.8, 1.4, 1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
+static const escp2_densities_t p3_5pl_densities =
+{ 2.8, 1.4, 1.77, 0.886, 0.443, 0.221, 0.240, 0.293, 0.146 };
+
static const escp2_densities_t c2pl_densities =
{ 2.0, 1.0, 0.5, 0.650, 0.650, 0.0, 0.650, 0.325, 0.0 };
@@ -643,6 +649,20 @@ static const char *r800_channel_names[] =
DECLARE_CHANNEL_LIST(r800);
+static const char *r2400_channel_names[] =
+{
+ N_("Light Light Black"),
+ N_("Light Magenta"),
+ N_("Light Cyan"),
+ N_("Light Black"),
+ N_("Black"),
+ N_("Cyan"),
+ N_("Magenta"),
+ N_("Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(r2400);
+
const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
{
/* FIRST GENERATION PRINTERS */
@@ -1840,6 +1860,40 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
&standard_quality_list, &new_init_sequence, &je_deinit_sequence,
NULL, &standard_channel_name_list
},
+ /* 70: Stylus Photo RX700 */
+ {
+ (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+ MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+ MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+ MODEL_PACKET_MODE_YES),
+ 180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
+ 360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0,
+ INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 4, 15, 0, 0,
+ p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
+ stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
+ variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+ &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+ NULL, &photo_channel_name_list
+ },
+ /* 71: Stylus Photo R2400 */
+ {
+ (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+ MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+ MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+ MODEL_PACKET_MODE_YES),
+ 180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
+ 360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+ INCH(13), INCH(1200), INCH(2), INCH(2),
+ 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+ 4, 15, 0, 0,
+ p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops,
+ stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
+ variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+ &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+ NULL, &r2400_channel_name_list
+ },
};
const int stpi_escp2_model_limit =
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 8b8344b..4c4f588 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2.c,v 1.343 2005/08/14 14:55:22 rleigh Exp $"
+ * "$Id: print-escp2.c,v 1.345 2005/10/23 19:43:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -497,6 +497,14 @@ static const float_param_t float_parameters[] =
},
{
{
+ "LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+ N_("Light Gray Transition"),
+ STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+ STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+ }, 0.0, 5.0, 1.0, 1
+ },
+ {
+ {
"Gray3Transition", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
N_("Dark Gray Transition"),
STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -1240,20 +1248,6 @@ set_hue_map_parameter(const stp_vars_t *v,
}
static void
-set_gray_transition_parameter(const stp_vars_t *v,
- stp_parameter_t *description,
- int expected_channels)
-{
- const escp2_inkname_t *ink_name = get_inktype(v);
- description->is_active = 0;
- if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
- (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
- expected_channels) &&
- using_automatic_settings(v, AUTO_MODE_MANUAL))
- fill_transition_parameters(description);
-}
-
-static void
set_color_transition_parameter(const stp_vars_t *v,
stp_parameter_t *description,
int color)
@@ -1272,6 +1266,22 @@ set_color_transition_parameter(const stp_vars_t *v,
}
}
+static void
+set_gray_transition_parameter(const stp_vars_t *v,
+ stp_parameter_t *description,
+ int expected_channels)
+{
+ const escp2_inkname_t *ink_name = get_inktype(v);
+ description->is_active = 0;
+ if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
+ (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+ expected_channels) &&
+ using_automatic_settings(v, AUTO_MODE_MANUAL))
+ fill_transition_parameters(description);
+ else
+ set_color_transition_parameter(v, description, STP_ECOLOR_K);
+}
+
static const res_t *
find_default_resolution(const stp_vars_t *v, int desired_hres, int desired_vres,
int strict)
@@ -1679,6 +1689,8 @@ escp2_parameters(const stp_vars_t *v, const char *name,
}
else if (strcmp(name, "GrayTransition") == 0)
set_gray_transition_parameter(v, description, 2);
+ else if (strcmp(name, "LightGrayTransition") == 0)
+ set_gray_transition_parameter(v, description, 2);
else if (strcmp(name, "Gray1Transition") == 0 ||
strcmp(name, "Gray2Transition") == 0 ||
strcmp(name, "Gray3Transition") == 0)
@@ -1733,9 +1745,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
}
else if (strcmp(name, "PrintingMode") == 0)
{
+ const escp2_inkname_t *ink_name = get_inktype(v);
description->bounds.str = stp_string_list_create();
- stp_string_list_add_string
- (description->bounds.str, "Color", _("Color"));
+ if (!ink_name || ink_name->inkset != INKSET_QUADTONE)
+ stp_string_list_add_string
+ (description->bounds.str, "Color", _("Color"));
stp_string_list_add_string
(description->bounds.str, "BW", _("Black and White"));
description->deflt.str =
@@ -1766,6 +1780,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
}
else if (strcmp(name, "MultiChannelLimit") == 0)
{
+ description->is_active = 0;
if (stp_get_string_parameter(v, "PrintingMode") &&
strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0 &&
using_automatic_settings(v, AUTO_MODE_MANUAL))
@@ -1774,8 +1789,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
if (ink_name && ink_name->inkset == INKSET_CMYKRB)
description->is_active = 1;
}
- else
- description->is_active = 0;
}
}
@@ -1944,6 +1957,8 @@ escp2_describe_output(const stp_vars_t *v)
{
switch (ink_type->inkset)
{
+ case INKSET_QUADTONE:
+ return "Grayscale";
case INKSET_CMYKRB:
case INKSET_CMYK:
case INKSET_CcMmYK:
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 0982996..8e4d373 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
/*
- * "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $"
*
* Print plug-in EPSON ESC/P2 driver for the GIMP.
*
@@ -71,7 +71,7 @@ typedef struct
const double dropsizes[MAX_DROP_SIZES];
} escp2_dropsize_t;
-typedef const escp2_dropsize_t *const escp2_drop_list_t[RES_N];
+typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
/*
****************************************************************
@@ -525,6 +525,7 @@ extern const escp2_drop_list_t stpi_escp2_variable_3pl_drops;
extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops;
extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops;
extern const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops;
+extern const escp2_drop_list_t stpi_escp2_variable_r2400_drops;
extern const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops;
extern const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops;
extern const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops;
@@ -536,6 +537,7 @@ extern const paperlist_t stpi_escp2_standard_paper_list;
extern const paperlist_t stpi_escp2_durabrite_paper_list;
extern const paperlist_t stpi_escp2_durabrite2_paper_list;
extern const paperlist_t stpi_escp2_ultrachrome_paper_list;
+extern const paperlist_t stpi_escp2_ultrachrome_k3_paper_list;
extern const paperlist_t stpi_escp2_r800_paper_list;
extern const paper_adjustment_list_t stpi_escp2_standard_paper_adjustment_list;
@@ -547,6 +549,8 @@ extern const paper_adjustment_list_t stpi_escp2_photo3_paper_adjustment_list;
extern const paper_adjustment_list_t stpi_escp2_sp960_paper_adjustment_list;
extern const paper_adjustment_list_t stpi_escp2_ultrachrome_photo_paper_adjustment_list;
extern const paper_adjustment_list_t stpi_escp2_ultrachrome_matte_paper_adjustment_list;
+extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_photo_paper_adjustment_list;
+extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_matte_paper_adjustment_list;
extern const paper_adjustment_list_t stpi_escp2_r800_photo_paper_adjustment_list;
extern const paper_adjustment_list_t stpi_escp2_r800_matte_paper_adjustment_list;
@@ -581,6 +585,7 @@ extern const inkgroup_t stpi_escp2_ultrachrome_inkgroup;
extern const inkgroup_t stpi_escp2_f360_photo_inkgroup;
extern const inkgroup_t stpi_escp2_f360_photo7_japan_inkgroup;
extern const inkgroup_t stpi_escp2_f360_ultrachrome_inkgroup;
+extern const inkgroup_t stpi_escp2_f360_ultrachrome_k3_inkgroup;
extern const inkgroup_t stpi_escp2_cmykrb_inkgroup;
extern const escp2_inkname_t stpi_escp2_default_black_inkset;
@@ -705,5 +710,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
#endif /* GUTENPRINT_INTERNAL_ESCP2_H */
/*
- * End of "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $".
*/
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index f879fba..a3dc35d 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,9 +1,10 @@
/*
- * "$Id: print-olympus.c,v 1.55 2005/07/01 09:56:12 m0m Exp $"
+ * "$Id: print-olympus.c,v 1.57 2005/10/21 08:55:40 m0m Exp $"
*
* Print plug-in Olympus driver for the GIMP.
*
- * Copyright 2003 Michael Mraka (Michael.Mraka@linux.cz)
+ * Copyright 2003 - 2005
+ * Michael Mraka (Michael.Mraka@linux.cz)
*
* The plug-in is based on the code of the RAW plugin for the GIMP of
* Michael Sweet (mike@easysw.com) and Robert Krawitz (rlk@alum.mit.edu)
@@ -908,6 +909,97 @@ static const char updp10_adj_yellow[] =
"</gutenprint>\n";
+/* Sony UP-DR150 */
+static const olymp_resolution_t updr150_res[] =
+{
+ { "346x346", 346, 346},
+};
+
+static const olymp_resolution_list_t updr150_res_list =
+{
+ updr150_res, sizeof(updr150_res) / sizeof(olymp_resolution_t)
+};
+
+static const olymp_pagesize_t updr150_page[] =
+{
+ { "w288h432", "2UPC-153 (4x6)", -1, -1, 0, 0, 3, 2},
+ { "B7", "2UPC-154 (3.5x5)", -1, -1, 3, 2, 0, 0},
+ { "w360h504", "2UPC-155 (5x7)", -1, -1, 0, 0, 4, 4},
+ { "w432h576", "2UPC-156 (6x8)", -1, -1, 3, 2, 5, 4},
+ { "Custom", NULL, -1, -1, 0, 0, 3, 2},
+};
+
+static const olymp_pagesize_list_t updr150_page_list =
+{
+ updr150_page, sizeof(updr150_page) / sizeof(olymp_pagesize_t)
+};
+
+static const olymp_printsize_t updr150_printsize[] =
+{
+ { "346x346", "w288h432", 1382, 2048},
+ { "346x346", "B7", 1210, 1728},
+ { "346x346", "w360h504", 1728, 2380},
+ { "346x346", "w432h576", 2048, 2724},
+ { "346x346", "Custom", 1382, 2048},
+};
+
+static const olymp_printsize_list_t updr150_printsize_list =
+{
+ updr150_printsize, sizeof(updr150_printsize) / sizeof(olymp_printsize_t)
+};
+
+static void updr150_printer_init_func(stp_vars_t *v)
+{
+ char pg = '\0';
+
+ stp_zfwrite("\x6a\xff\xff\xff\xef\xff\xff\xff", 1, 8, v);
+ if (strcmp(privdata.pagesize,"B7") == 0)
+ pg = '\x01';
+ else if (strcmp(privdata.pagesize,"w288h432") == 0)
+ pg = '\x02';
+ else if (strcmp(privdata.pagesize,"w360h504") == 0)
+ pg = '\x03';
+ else if (strcmp(privdata.pagesize,"w432h576") == 0)
+ pg = '\x04';
+ stp_putc(pg, v);
+
+ stp_zfwrite("\x00\x00\x00\xfc\xff\xff\xff"
+ "\xfb\xff\xff\xff\xf4\xff\xff\xff"
+ "\xf5\xff\xff\xff\x01\x00\x00\x00"
+ "\x07\x00\x00\x00\x1b\xe5\x00\x00"
+ "\x00\x08\x00\x08\x00\x00\x00\x00"
+ "\x00\x00\x00\x00\x00\x01\x00\xed"
+ "\xff\xff\xff\x07\x00\x00\x00\x1b"
+ "\xee\x00\x00\x00\x02\x00\x02\x00"
+ "\x00\x00\x00\x01\x07\x00\x00\x00"
+ "\x1b\x15\x00\x00\x00\x0d\x00\x0d"
+ "\x00\x00\x00\x00\x00\x00\x00\x07"
+ "\x00\x00\x00\x00", 1, 91, v);
+ stp_put16_be(privdata.xsize, v);
+ stp_put16_be(privdata.ysize, v);
+ stp_zfwrite("\xf9\xff\xff\xff\x07\x00\x00\x00"
+ "\x1b\xe1\x00\x00\x00\x0b\x00\x0b"
+ "\x00\x00\x00\x00\x80\x00\x00\x00"
+ "\x00\x00", 1, 26, v);
+ stp_put16_be(privdata.xsize, v);
+ stp_put16_be(privdata.ysize, v);
+ stp_zfwrite("\xf8\xff\xff\xff\x0b\x00\x00\x00\x1b\xea"
+ "\x00\x00\x00\x00", 1, 14, v);
+ stp_put32_be(privdata.xsize*privdata.ysize*3, v);
+ stp_zfwrite("\x00", 1, 1, v);
+ stp_put32_le(privdata.xsize*privdata.ysize*3, v);
+}
+
+static void updr150_printer_end_func(stp_vars_t *v)
+{
+ stp_zfwrite("\xfc\xff\xff"
+ "\xff\xfa\xff\xff\xff\x07\x00\x00"
+ "\x00\x1b\x0a\x00\x00\x00\x00\x00"
+ "\x07\x00\x00\x00\x1b\x17\x00\x00"
+ "\x00\x00\x00\xf3\xff\xff\xff"
+ , 1, 34, v);
+}
+
/* Fujifilm CX-400 */
static const olymp_resolution_t cx400_res[] =
{
@@ -984,6 +1076,7 @@ static const olymp_resolution_t all_resolutions[] =
{ "300x300", 300, 300},
{ "317x316", 317, 316},
{ "320x320", 320, 320},
+ { "346x346", 346, 346},
};
static const olymp_resolution_list_t all_res_list =
@@ -993,7 +1086,7 @@ static const olymp_resolution_list_t all_res_list =
static const olympus_cap_t olympus_model_capabilities[] =
{
- { /* Olympus P-10 */
+ { /* Olympus P-10, P-11 */
2,
&rgb_ink_list,
&res_320dpi_list,
@@ -1084,7 +1177,8 @@ static const olympus_cap_t olympus_model_capabilities[] =
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL,
},
- { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-600 */
+ { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-510,
+ SELPHY CP-600, SELPHY CP-710 */
1001,
&ymc_ink_list,
&res_314dpi_list,
@@ -1116,6 +1210,21 @@ static const olympus_cap_t olympus_model_capabilities[] =
updp10_adj_cyan, updp10_adj_magenta, updp10_adj_yellow,
&updp10_laminate_list,
},
+ { /* Sony UP-DR150 */
+ 2001,
+ &rgb_ink_list,
+ &updr150_res_list,
+ &updr150_page_list,
+ &updr150_printsize_list,
+ OLYMPUS_INTERLACE_NONE,
+ 1800,
+ OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+ &updr150_printer_init_func, &updr150_printer_end_func,
+ NULL, NULL,
+ NULL, NULL,
+ NULL, NULL, NULL,
+ NULL,
+ },
{ /* Fujifilm Printpix CX-400 */
3000,
&rgb_ink_list,
@@ -1605,7 +1714,8 @@ olympus_do_print(stp_vars_t *v, stp_image_t *image)
const int model = stp_get_model_id(v);
const char *ink_type = stp_get_string_parameter(v, "InkType");
const olympus_cap_t *caps = olympus_get_model_capabilities(model);
- int max_print_px_width, max_print_px_height;
+ int max_print_px_width = 0;
+ int max_print_px_height = 0;
int xdpi, ydpi; /* Resolution */
/* image in pixels */
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index e02b2bd..ea41b4f 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-pcl.c,v 1.139 2005/07/03 22:13:39 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.140 2005/10/18 02:08:17 rlk Exp $"
*
* Print plug-in HP PCL driver for the GIMP.
*
@@ -1446,7 +1446,7 @@ static const stp_param_string_t duplex_types[] =
* 'pcl_papersize_valid()' - Is the paper size valid for this printer.
*/
-static const int
+static int
pcl_papersize_valid(const stp_papersize_t *pt,
int model)
{
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 6157db2..9d7e20e 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-ps.c,v 1.79 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-ps.c,v 1.81 2005/10/10 12:52:29 rlk Exp $"
*
* Print plug-in Adobe PostScript driver for the GIMP.
*
@@ -623,6 +623,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
else
stp_set_string_parameter(nv, "STPIOutputType", "Whitescale");
+ stp_set_boolean_parameter(nv, "SimpleGamma", 1);
+
out_channels = stp_color_init(nv, image, 256);
if (model == 0)
@@ -652,6 +654,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
}
else
{
+ unsigned short *tmp_buf =
+ stp_malloc(sizeof(unsigned short) * (image_width * out_channels + 3));
if (strcmp(print_mode, "Color") == 0)
stp_puts("/DeviceRGB setcolorspace\n", v);
else
@@ -681,6 +685,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
for (y = 0, out_offset = 0; y < image_height; y ++)
{
+ unsigned short *where;
/* FIXME!!! */
if (stp_color_get_row(nv, image, y /*, out + out_offset */ , &zero_mask))
{
@@ -688,23 +693,33 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
break;
}
out = stp_channel_get_input(nv);
+ if (out_offset > 0)
+ {
+ memcpy(tmp_buf + out_offset, out,
+ image_width * out_channels * sizeof(unsigned short));
+ where = tmp_buf;
+ }
+ else
+ where = out;
out_ps_height = out_offset + image_width * out_channels;
if (y < (image_height - 1))
{
- ps_ascii85(v, out, out_ps_height & ~3, 0);
+ ps_ascii85(v, where, out_ps_height & ~3, 0);
out_offset = out_ps_height & 3;
}
else
{
- ps_ascii85(v, out, out_ps_height, 1);
+ ps_ascii85(v, where, out_ps_height, 1);
out_offset = 0;
}
if (out_offset > 0)
- memcpy(out, out + out_ps_height - out_offset, out_offset);
+ memcpy(tmp_buf, where + out_ps_height - out_offset,
+ out_offset * sizeof(unsigned short));
}
+ stp_free(tmp_buf);
}
stp_image_conclude(image);
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index f6353f3..dfad151 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-raw.c,v 1.36 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-raw.c,v 1.37 2005/09/17 21:54:34 rlk Exp $"
*
* Print plug-in RAW driver for the GIMP.
*
@@ -237,6 +237,7 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
}
stp_set_float_parameter(nv, "Density", 1.0);
+ stp_set_boolean_parameter(nv, "SimpleGamma", 1);
stp_channel_reset(nv);
for (i = 0; i < ink_channels; i++)
stp_channel_add(nv, i, 0, 1.0);
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index 8b480de..5c3d621 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-vars.c,v 1.73 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-vars.c,v 1.74 2005/10/26 01:28:35 rlk Exp $"
*
* Print plug-in driver utility functions for the GIMP.
*
@@ -500,6 +500,12 @@ stp_set_default_string_parameter_n(stp_vars_t *v, const char *parameter,
const char *value, size_t bytes)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_STRING_LIST];
+ if (value)
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s, %s)\n",
+ parameter, value);
+ else
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s)\n",
+ parameter);
set_default_raw_parameter(list, parameter, value, bytes,
STP_PARAMETER_TYPE_STRING_LIST);
stp_set_verified(v, 0);
@@ -511,15 +517,7 @@ stp_set_default_string_parameter(stp_vars_t *v, const char *parameter,
{
int byte_count = 0;
if (value)
- {
- byte_count = strlen(value);
- stp_dprintf(STP_DBG_VARS, v,
- "stp_set_default_string_parameter(%s, %s)\n",
- parameter, value);
- }
- else
- stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s)\n",
- parameter);
+ byte_count = strlen(value);
stp_set_default_string_parameter_n(v, parameter, value, byte_count);
stp_set_verified(v, 0);
}
@@ -593,6 +591,12 @@ stp_set_file_parameter(stp_vars_t *v, const char *parameter,
size_t byte_count = 0;
if (value)
byte_count = strlen(value);
+ if (value)
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
+ parameter, value);
+ else
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
+ parameter);
set_raw_parameter(list, parameter, value, byte_count,
STP_PARAMETER_TYPE_FILE);
stp_set_verified(v, 0);
@@ -603,6 +607,12 @@ stp_set_file_parameter_n(stp_vars_t *v, const char *parameter,
const char *value, size_t byte_count)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
+ if (value)
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
+ parameter, value);
+ else
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
+ parameter);
set_raw_parameter(list, parameter, value, byte_count,
STP_PARAMETER_TYPE_FILE);
stp_set_verified(v, 0);
@@ -616,6 +626,12 @@ stp_set_default_file_parameter(stp_vars_t *v, const char *parameter,
size_t byte_count = 0;
if (value)
byte_count = strlen(value);
+ if (value)
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
+ parameter, value);
+ else
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
+ parameter);
set_default_raw_parameter(list, parameter, value, byte_count,
STP_PARAMETER_TYPE_FILE);
stp_set_verified(v, 0);
@@ -626,6 +642,12 @@ stp_set_default_file_parameter_n(stp_vars_t *v, const char *parameter,
const char *value, size_t byte_count)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
+ if (value)
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
+ parameter, value);
+ else
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
+ parameter);
set_default_raw_parameter(list, parameter, value, byte_count,
STP_PARAMETER_TYPE_FILE);
stp_set_verified(v, 0);
@@ -658,6 +680,7 @@ stp_set_curve_parameter(stp_vars_t *v, const char *parameter,
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_curve_parameter(%s)\n", parameter);
if (curve)
{
value_t *val;
@@ -690,6 +713,8 @@ stp_set_default_curve_parameter(stp_vars_t *v, const char *parameter,
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_curve_parameter(%s)\n",
+ parameter);
if (!item)
{
if (curve)
@@ -764,6 +789,7 @@ stp_set_default_array_parameter(stp_vars_t *v, const char *parameter,
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_array_parameter(%s)\n", parameter);
if (!item)
{
if (array)
@@ -792,6 +818,8 @@ stp_get_array_parameter(const stp_vars_t *v, const char *parameter)
const stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
const value_t *val;
const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_array_parameter(%s)\n",
+ parameter);
if (item)
{
val = (const value_t *) stp_list_item_get_data(item);
@@ -807,6 +835,8 @@ stp_set_int_parameter(stp_vars_t *v, const char *parameter, int ival)
stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_int_parameter(%s, %d)\n",
+ parameter, ival);
if (item)
{
val = (value_t *) stp_list_item_get_data(item);
@@ -831,6 +861,8 @@ stp_set_default_int_parameter(stp_vars_t *v, const char *parameter, int ival)
stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_int_parameter(%s, %d)\n",
+ parameter, ival);
if (!item)
{
val = stp_malloc(sizeof(value_t));
@@ -848,6 +880,7 @@ stp_clear_int_parameter(stp_vars_t *v, const char *parameter)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_clear_int_parameter(%s)\n", parameter);
if (item)
stp_list_item_destroy(list, item);
stp_set_verified(v, 0);
@@ -890,6 +923,8 @@ stp_set_boolean_parameter(stp_vars_t *v, const char *parameter, int ival)
stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_boolean_parameter(%s, %d)\n",
+ parameter, ival);
if (item)
{
val = (value_t *) stp_list_item_get_data(item);
@@ -918,6 +953,8 @@ stp_set_default_boolean_parameter(stp_vars_t *v, const char *parameter,
stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_boolean_parameter(%s, %d)\n",
+ parameter, ival);
if (!item)
{
val = stp_malloc(sizeof(value_t));
@@ -938,6 +975,7 @@ stp_clear_boolean_parameter(stp_vars_t *v, const char *parameter)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_clear_boolean_parameter(%s)\n", parameter);
if (item)
stp_list_item_destroy(list, item);
stp_set_verified(v, 0);
@@ -980,6 +1018,8 @@ stp_set_dimension_parameter(stp_vars_t *v, const char *parameter, int ival)
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_dimension_parameter(%s, %d)\n",
+ parameter, ival);
if (item)
{
val = (value_t *) stp_list_item_get_data(item);
@@ -1004,6 +1044,8 @@ stp_set_default_dimension_parameter(stp_vars_t *v, const char *parameter, int iv
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_dimension_parameter(%s, %d)\n",
+ parameter, ival);
if (!item)
{
val = stp_malloc(sizeof(value_t));
@@ -1021,6 +1063,7 @@ stp_clear_dimension_parameter(stp_vars_t *v, const char *parameter)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_clear_dimension_parameter(%s)\n", parameter);
if (item)
stp_list_item_destroy(list, item);
stp_set_verified(v, 0);
@@ -1063,6 +1106,8 @@ stp_set_float_parameter(stp_vars_t *v, const char *parameter, double dval)
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_float_parameter(%s, %f)\n",
+ parameter, dval);
if (item)
{
val = (value_t *) stp_list_item_get_data(item);
@@ -1088,6 +1133,8 @@ stp_set_default_float_parameter(stp_vars_t *v, const char *parameter,
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
value_t *val;
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_set_default_float_parameter(%s, %f)\n",
+ parameter, dval);
if (!item)
{
val = stp_malloc(sizeof(value_t));
@@ -1105,6 +1152,7 @@ stp_clear_float_parameter(stp_vars_t *v, const char *parameter)
{
stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+ stp_dprintf(STP_DBG_VARS, v, "stp_clear_float_parameter(%s)\n", parameter);
if (item)
stp_list_item_destroy(list, item);
stp_set_verified(v, 0);
diff --git a/src/main/printers.xml b/src/main/printers.xml
index 97300b7..d6e9ed3 100644
--- a/src/main/printers.xml
+++ b/src/main/printers.xml
@@ -4,7 +4,7 @@
XML description of printers known to libgutenprint
This file was originally generated. It should be edited by hand.
- "$Id: printers.xml,v 1.124 2005/08/10 11:27:35 rlk Exp $"
+ "$Id: printers.xml,v 1.135 2005/11/21 12:25:38 rlk Exp $"
-->
<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -102,6 +102,10 @@
<parameter type="float" name="Gamma">1.000</parameter>
<parameter type="float" name="Density">0.800</parameter>
</printer>
+ <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="4202">
+        <parameter type="float" name="Gamma">0.800</parameter>
+        <parameter type="float" name="Density">0.900</parameter>
+      </printer>
<printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000">
<parameter type="float" name="Gamma">1.000</parameter>
<parameter type="float" name="Density">0.800</parameter>
@@ -124,6 +128,12 @@
</printer>
</family>
<family name="escp2">
+ <printer name="EPSON Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -136,6 +146,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -148,6 +164,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -160,6 +182,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -172,6 +200,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -184,6 +218,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -208,6 +248,12 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43">
+ <parameter type="float" name="MagentaGamma">0.95</parameter>
+ <parameter type="float" name="YellowGamma">0.9</parameter>
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -242,6 +288,10 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -270,6 +320,10 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus Color" driver="escp2" manufacturer="Epson" model="0">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -518,6 +572,10 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="63">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -526,6 +584,14 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="63">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="63">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -562,6 +628,10 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -570,6 +640,10 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27">
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
@@ -643,6 +717,25 @@
<parameter type="float" name="Gamma">0.470</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65">
<parameter type="float" name="CyanGamma">0.96</parameter>
<parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -650,6 +743,20 @@
<parameter type="float" name="Gamma">0.500</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55">
<parameter type="float" name="CyanGamma">0.96</parameter>
<parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -678,6 +785,13 @@
<parameter type="float" name="Gamma">0.500</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="60">
<parameter type="float" name="CyanGamma">0.96</parameter>
<parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -706,6 +820,20 @@
<parameter type="float" name="Gamma">0.500</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="60">
<parameter type="float" name="CyanGamma">0.96</parameter>
<parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -720,6 +848,33 @@
<parameter type="float" name="Gamma">0.500</parameter>
<parameter type="float" name="Density">1.0</parameter>
</printer>
+ <printer name="EPSON Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65">
+ <parameter type="float" name="CyanGamma">0.96</parameter>
+ <parameter type="float" name="MagentaGamma">1.02</parameter>
+ <parameter type="float" name="YellowGamma">1.02</parameter>
+ <parameter type="float" name="Gamma">0.500</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
+ <printer name="EPSON Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="66">
+ <parameter type="float" name="Gamma">0.470</parameter>
+ <parameter type="float" name="Density">1.0</parameter>
+ </printer>
<printer name="EPSON CL-700" driver="escp2-cl700" manufacturer="Epson" model="38">
<parameter type="float" name="MagentaGamma">0.95</parameter>
<parameter type="float" name="YellowGamma">0.9</parameter>
@@ -1219,6 +1374,8 @@
</printer>
<printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000">
</printer>
+ <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001">
+ </printer>
<printer name="Fujifilm Printpix CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000">
</printer>
<printer name="Fujifilm Printpix CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001">
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 08:12:14 +0000