Attachment 4306 Details for Bug 23157 – Патч для gutenprint

[patch] Патч для gutenprint

gutenprint-5.2.5-MP970.patch (text/plain), 17.37 KB, created by serpiph on 2010-03-15 22:39:02 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: serpiph

Created: 2010-03-15 22:39:02 MSK

Size: 17.37 KB

patch

obsolete

>diff -Naur gutenprint-5.2.5.orig/po/cs.po gutenprint-5.2.5/po/cs.po
>--- gutenprint-5.2.5.orig/po/cs.po	2010-02-12 04:12:39.000000000 +0300
>+++ gutenprint-5.2.5/po/cs.po	2010-03-14 08:00:38.216529188 +0300
>@@ -8335,6 +8335,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/da.po gutenprint-5.2.5/po/da.po
>--- gutenprint-5.2.5.orig/po/da.po	2010-02-12 04:12:40.000000000 +0300
>+++ gutenprint-5.2.5/po/da.po	2010-03-14 08:00:11.779783200 +0300
>@@ -8057,6 +8057,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/de.po gutenprint-5.2.5/po/de.po
>--- gutenprint-5.2.5.orig/po/de.po	2010-02-12 04:12:41.000000000 +0300
>+++ gutenprint-5.2.5/po/de.po	2010-03-14 08:00:23.876276464 +0300
>@@ -8219,6 +8219,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/el.po gutenprint-5.2.5/po/el.po
>--- gutenprint-5.2.5.orig/po/el.po	2010-02-12 04:12:41.000000000 +0300
>+++ gutenprint-5.2.5/po/el.po	2010-03-14 08:00:44.548269889 +0300
>@@ -8249,6 +8249,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/en_GB.po gutenprint-5.2.5/po/en_GB.po
>--- gutenprint-5.2.5.orig/po/en_GB.po	2010-02-12 04:12:42.000000000 +0300
>+++ gutenprint-5.2.5/po/en_GB.po	2010-03-14 08:02:28.136141567 +0300
>@@ -8069,6 +8069,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/es.po gutenprint-5.2.5/po/es.po
>--- gutenprint-5.2.5.orig/po/es.po	2010-02-12 04:12:43.000000000 +0300
>+++ gutenprint-5.2.5/po/es.po	2010-03-14 08:00:52.496332502 +0300
>@@ -8412,6 +8412,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/fr.po gutenprint-5.2.5/po/fr.po
>--- gutenprint-5.2.5.orig/po/fr.po	2010-02-12 04:12:44.000000000 +0300
>+++ gutenprint-5.2.5/po/fr.po	2010-03-14 08:01:06.455780267 +0300
>@@ -8246,6 +8246,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon iP4000"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> #, fuzzy
> msgid "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/gutenprint.pot gutenprint-5.2.5/po/gutenprint.pot
>--- gutenprint-5.2.5.orig/po/gutenprint.pot	2010-02-12 04:12:38.000000000 +0300
>+++ gutenprint-5.2.5/po/gutenprint.pot	2010-03-14 08:08:30.815780061 +0300
>@@ -7792,6 +7792,9 @@
> msgid "Canon PIXMA MP830"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6341
> msgid "Canon PIXUS iP3100"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/hu.po gutenprint-5.2.5/po/hu.po
>--- gutenprint-5.2.5.orig/po/hu.po	2010-02-12 04:12:45.000000000 +0300
>+++ gutenprint-5.2.5/po/hu.po	2010-03-14 08:01:24.317025085 +0300
>@@ -7951,6 +7951,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/it.po gutenprint-5.2.5/po/it.po
>--- gutenprint-5.2.5.orig/po/it.po	2010-02-12 04:12:46.000000000 +0300
>+++ gutenprint-5.2.5/po/it.po	2010-03-14 08:03:42.827780076 +0300
>@@ -8144,6 +8144,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/ja.po gutenprint-5.2.5/po/ja.po
>--- gutenprint-5.2.5.orig/po/ja.po	2010-02-12 04:12:47.000000000 +0300
>+++ gutenprint-5.2.5/po/ja.po	2010-03-14 08:03:49.635780178 +0300
>@@ -8350,6 +8350,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/nb.po gutenprint-5.2.5/po/nb.po
>--- gutenprint-5.2.5.orig/po/nb.po	2010-02-12 04:12:47.000000000 +0300
>+++ gutenprint-5.2.5/po/nb.po	2010-03-14 08:03:18.863778176 +0300
>@@ -8108,6 +8108,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Stylus C60"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> #, fuzzy
> msgid "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/nl.po gutenprint-5.2.5/po/nl.po
>--- gutenprint-5.2.5.orig/po/nl.po	2010-02-12 04:12:48.000000000 +0300
>+++ gutenprint-5.2.5/po/nl.po	2010-03-14 08:03:11.967778299 +0300
>@@ -8076,6 +8076,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/pl.po gutenprint-5.2.5/po/pl.po
>--- gutenprint-5.2.5.orig/po/pl.po	2010-02-12 04:12:49.000000000 +0300
>+++ gutenprint-5.2.5/po/pl.po	2010-03-14 08:02:51.352779495 +0300
>@@ -8011,6 +8011,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/pt.po gutenprint-5.2.5/po/pt.po
>--- gutenprint-5.2.5.orig/po/pt.po	2010-02-12 04:12:50.000000000 +0300
>+++ gutenprint-5.2.5/po/pt.po	2010-03-14 08:02:46.331809196 +0300
>@@ -8383,6 +8383,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/ru.po gutenprint-5.2.5/po/ru.po
>--- gutenprint-5.2.5.orig/po/ru.po	2010-02-12 04:12:50.000000000 +0300
>+++ gutenprint-5.2.5/po/ru.po	2010-03-14 08:02:15.924283750 +0300
>@@ -7826,6 +7826,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Canon PIXMA MP770"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr "Canon PIXMA MP970"
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/sk.po gutenprint-5.2.5/po/sk.po
>--- gutenprint-5.2.5.orig/po/sk.po	2010-02-12 04:12:51.000000000 +0300
>+++ gutenprint-5.2.5/po/sk.po	2010-03-14 08:02:40.452028350 +0300
>@@ -8374,6 +8374,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> msgid "Canon PIXMA MP780"
> msgstr ""
>diff -Naur gutenprint-5.2.5.orig/po/sv.po gutenprint-5.2.5/po/sv.po
>--- gutenprint-5.2.5.orig/po/sv.po	2010-02-12 04:12:52.000000000 +0300
>+++ gutenprint-5.2.5/po/sv.po	2010-03-14 08:02:34.575780107 +0300
>@@ -8288,6 +8288,9 @@
> msgid "Canon PIXMA MP770"
> msgstr "Epson PM 770C"
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> #, fuzzy
> msgid "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/po/zh_TW.po gutenprint-5.2.5/po/zh_TW.po
>--- gutenprint-5.2.5.orig/po/zh_TW.po	2010-02-12 04:12:52.000000000 +0300
>+++ gutenprint-5.2.5/po/zh_TW.po	2010-03-14 07:59:56.412529205 +0300
>@@ -7995,6 +7995,9 @@
> msgid "Canon PIXMA MP770"
> msgstr ""
> 
>+msgid "Canon PIXMA MP970"
>+msgstr ""
>+
> #: src/xml/xmli18n-tmp.h:6338
> #, fuzzy
> msgid "Canon PIXMA MP780"
>diff -Naur gutenprint-5.2.5.orig/src/foomatic/foomatic-printermap gutenprint-5.2.5/src/foomatic/foomatic-printermap
>--- gutenprint-5.2.5.orig/src/foomatic/foomatic-printermap	2010-01-16 22:50:09.000000000 +0300
>+++ gutenprint-5.2.5/src/foomatic/foomatic-printermap	2010-03-14 07:57:10.811777673 +0300
>@@ -132,6 +132,7 @@
> #gptofoo bjc-MULTIPASS-MP780 printer/Canon-MULTIPASS-MP780
> #gptofoo bjc-MULTIPASS-MP790 printer/Canon-MULTIPASS-MP790
> #gptofoo bjc-MULTIPASS-MP830 printer/Canon-MULTIPASS-MP830
>+#gptofoo bjc-MULTIPASS-MP970 printer/Canon-MULTIPASS-MP970
> #gptofoo bjc-PIXUS-iP3100 printer/Canon-PIXUS-iP3100
> #gptofoo bjc-PIXUS-iP4100 printer/Canon-PIXUS-iP4100
> #gptofoo bjc-i80 printer/Canon-i80
>diff -Naur gutenprint-5.2.5.orig/src/main/canon-inks.h gutenprint-5.2.5/src/main/canon-inks.h
>--- gutenprint-5.2.5.orig/src/main/canon-inks.h	2009-05-24 06:39:59.000000000 +0400
>+++ gutenprint-5.2.5/src/main/canon-inks.h	2010-03-15 21:53:48.943776995 +0300
>@@ -278,6 +278,58 @@
>         {'m',1.0,&canon_3b_7l_ink}
> };
> 
>+static const canon_inkset_t canon_7_c4m4k4C4M4Y4K4_inkset[] = {
>+        {'c',0.5,&canon_2b_4l_ink},
>+        {'m',0.5,&canon_2b_4l_ink},
>+        {'k',0.5,&canon_2b_4l_ink},
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_2b_4l_ink},
>+};
>+
>+static const canon_inkset_t canon_7_C4M4Y4c4m4k4K4_inkset[] = {
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'c',1.0,&canon_2b_4l_ink},
>+        {'m',1.0,&canon_2b_4l_ink},
>+        {'k',1.0,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_2b_4l_ink},
>+};
>+
>+static const canon_inkset_t canon_7_c4m4C4M4Y4k4K4_inkset[] = {
>+        {'c',0.5,&canon_2b_4l_ink},
>+        {'m',0.5,&canon_2b_4l_ink},
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'k',0.5,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_2b_4l_ink},
>+};
>+
>+static const canon_inkset_t canon_19_C4M4Y4K4c4m4k4_inkset[] = {
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_2b_4l_ink},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {'c',0.5,&canon_2b_4l_ink},
>+        {'m',0.5,&canon_2b_4l_ink},
>+        {'k',0.5,&canon_2b_4l_ink},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+        {0,0.0,NULL},
>+};
>+
> static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
>         {'C',1.0,&canon_2b_3l_ink},
>         {'M',1.0,&canon_2b_3l_ink},
>@@ -353,6 +405,42 @@
>         {0,0.0,NULL}
> };
> 
>+static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c2_inkset[] = {
>+        {'C',1.0,&canon_2b_3l_c_ink},
>+        {'M',1.0,&canon_2b_3l_c_ink},
>+        {'Y',1.0,&canon_2b_3l_c_ink},
>+        {'K',1.0,&canon_1b_2l_ink},
>+        {'c',0.5,&canon_2b_3l_c_ink},
>+        {'m',0.5,&canon_2b_3l_c_ink},
>+        {0,0.0,NULL},
>+        {'k',1.0,&canon_2b_3l_c_ink},
>+        {0,0.0,NULL}
>+};
>+
>+static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_2_inkset[] = {
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_1b_2l_ink},
>+        {'c',1.0,&canon_2b_4l_ink},
>+        {'m',1.0,&canon_2b_4l_ink},
>+        {0,0.0,NULL},
>+        {'k',1.0,&canon_2b_4l_ink},
>+        {0,0.0,NULL}
>+};
>+
>+static const canon_inkset_t canon_9_C4M4Y4K4c16m16k16_inkset[] = {
>+        {'C',1.0,&canon_2b_4l_ink},
>+        {'M',1.0,&canon_2b_4l_ink},
>+        {'Y',1.0,&canon_2b_4l_ink},
>+        {'K',1.0,&canon_2b_4l_ink},
>+        {'c',0.33,&canon_4b_16l_ink},
>+        {'m',0.33,&canon_4b_16l_ink},
>+        {0,0.0,NULL},
>+        {'k',0.33,&canon_4b_16l_ink},
>+        {0,0.0,NULL}
>+};
>+
> /* iP4000 mode used for T-Shirt (quality 2) */
> static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
>         {'C',1.0,&canon_2b_4l_ink},
>@@ -488,6 +576,55 @@
> 	{0,0.0,NULL},
> };
> 
>+static const canon_inkset_t canon_13_C3M3Y4K2c3m3k3_c_inkset[] = {
>+	{'C',1.0,&canon_2b_3l_c_ink},
>+	{'M',1.0,&canon_2b_3l_c_ink},
>+	{'Y',1.0,&canon_2b_3l_c_ink},
>+	{'K',1.0,&canon_1b_2l_ink},
>+	{'c',1.0,&canon_2b_3l_c_ink},
>+	{'m',1.0,&canon_2b_3l_c_ink},
>+	{0,0.0,NULL},
>+	{'k',1.0,&canon_2b_3l_c_ink},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+};
>+
>+static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
>+	{'C',1.0,&canon_2b_4l_ink},
>+	{'M',1.0,&canon_2b_4l_ink},
>+	{'Y',1.0,&canon_2b_4l_ink},
>+	{'K',1.0,&canon_1b_2l_ink},
>+	{'c',1.0,&canon_2b_4l_ink},
>+	{'m',1.0,&canon_2b_4l_ink},
>+	{0,0.0,NULL},
>+	{'k',1.0,&canon_2b_4l_ink},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+};
>+
>+static const canon_inkset_t canon_13_C4M4Y4K2c16m16k16_inkset[] = {
>+	{'C',1.0,&canon_2b_4l_ink},
>+	{'M',1.0,&canon_2b_4l_ink},
>+	{'Y',1.0,&canon_2b_4l_ink},
>+	{'K',1.0,&canon_1b_2l_ink},
>+	{'c',1.0,&canon_4b_16l_ink},
>+	{'m',1.0,&canon_4b_16l_ink},
>+	{0,0.0,NULL},
>+	{'k',1.0,&canon_4b_16l_ink},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+	{0,0.0,NULL},
>+};
>+
>+
> static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
> 	{'C',1.0,&canon_4b_6l_ink},
> 	{'M',1.0,&canon_4b_6l_ink},
>diff -Naur gutenprint-5.2.5.orig/src/main/canon-modes.h gutenprint-5.2.5/src/main/canon-modes.h
>--- gutenprint-5.2.5.orig/src/main/canon-modes.h	2008-02-18 06:48:08.000000000 +0300
>+++ gutenprint-5.2.5/src/main/canon-modes.h	2010-03-15 21:52:45.184276510 +0300
>@@ -80,6 +80,7 @@
> 
> /* delay settings for the different printmodes  last entry has to be {0,0} */
> static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};
>+static const canon_delay_t delay_1200[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{0,0}};
> static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};
> 
> 
>@@ -347,6 +348,21 @@
> };
> DECLARE_MODES(canon_MULTIPASS_MP830,0);
> 
>+static const canon_mode_t canon_MULTIPASS_MP970_modes[] = {
>+#if 0
>+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI MP610"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
>+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MP770"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
>+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
>+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y4K2c3m3k4_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
>+#endif
>+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
>+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
>+#if 0
>+  { 1200,1200,CANON_INK_CcMmYK|CANON_INK_K,"1200x1200dpi_high",N_("1200x1200 DPI HIGH"),INKSET(7_k4c4m4K4M4C4Y4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,2.0,2.0,NULL,NULL,NULL,0},
>+#endif
>+};
>+DECLARE_MODES(canon_MULTIPASS_MP970,1);
>+
> static const canon_mode_t canon_PIXMA_iX5000_modes[] = {
>   {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
> };
>diff -Naur gutenprint-5.2.5.orig/src/main/canon-printers.h gutenprint-5.2.5/src/main/canon-printers.h
>--- gutenprint-5.2.5.orig/src/main/canon-printers.h	2008-12-21 18:05:13.000000000 +0300
>+++ gutenprint-5.2.5/src/main/canon-printers.h	2010-03-15 21:51:39.283780007 +0300
>@@ -185,6 +185,24 @@
>     NULL,
>     NULL
>   },
>+  { /* Canon PIXMA MP970 */
>+    "PIXMA MP970", 3,          /*model, model_id*/
>+    842, 17*72,       /* max paper width and height */
>+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
>+    8,
>+    &canon_PIXMA_iP4000_slotlist,
>+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
>+#if 0
>+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000,  /*features */
>+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
>+#endif
>+    &canon_MULTIPASS_MP970_modelist,
>+    &canon_PIXMA_iP4000_paperlist,
>+    NULL,
>+    NULL,
>+    NULL,
>+    NULL
>+  },
>   /* ******************************** */
>   /*                                  */
>   /* tested and color-adjusted models */
>diff -Naur gutenprint-5.2.5.orig/src/xml/printers.xml gutenprint-5.2.5/src/xml/printers.xml
>--- gutenprint-5.2.5.orig/src/xml/printers.xml	2010-02-12 04:02:12.000000000 +0300
>+++ gutenprint-5.2.5/src/xml/printers.xml	2010-03-14 07:59:15.939812561 +0300
>@@ -162,6 +162,7 @@
>       <printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
>       <printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
>       <printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" />
>+      <printer translate="name" name="Canon PIXMA MP970" driver="bjc-MULTIPASS-MP970" manufacturer="Canon" model="5000970" parameters="PIXMA_iP4000_params" />
>       <printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" />
>       <printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" />
>       <printer translate="name" name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" />

Actions: View | Diff

Attachments on bug 23157: 4306