[prev in list] [next in list] [prev in thread] [next in thread]
List: gimp-print-devel
Subject: [Gimp-print-devel] diffs for Canon MP960 addition to gutenprint
From: Gernot Hassenpflug <aikishugyo () gmail ! com>
Date: 2010-09-29 14:26:58
Message-ID: AANLkTinJRWR=zQ53K+4UcvrJkoEr9zs2GwPhJ0PFSe-- () mail ! gmail ! com
[Download RAW message or body]
Hello all,
Here the modified files for supporting the Canon MP960.
Changed files:
print/test/pixma_parse.c
print/src/xml/printers.xml
print/src/main/canon-printers.h
print/src/main/canon-modes.h
print/src/main/canon-inks.h
In my new files I added "-mp960" to the filename and took diffs to the
originals. Here the unified diffes attached.
Best regards,
Gernot Hassenpflug
--
ISP Asahi-Net: http://asahi-net.jp/en/
No.1 in Japan by customer satisfaction
(Nikkei News, 7 July 2010)
["pixma_parse.c.diff" (application/octet-stream)]
--- pixma_parse.c-mp960 2010-09-29 23:20:10.000000000 +0900
+++ pixma_parse.c 2010-09-29 23:20:23.000000000 +0900
@@ -406,8 +406,6 @@
printf(" bit_info: using detailed color settings for max %i colors\n",num_colors);
if(buf[1]==0x80)
printf(" format: BJ indexed color image format\n");
- else if(buf[1]==0x00)
- printf(" format: iP8500 flag set, BJ indexed color image format\n");
else{
printf(" format: settings not supported 0x%x\n",buf[1]);
returnv = -2;
["printers.xml.diff" (application/octet-stream)]
--- printers.xml-mp960 2010-09-29 23:18:42.000000000 +0900
+++ printers.xml 2010-09-29 23:18:23.000000000 +0900
@@ -166,7 +166,6 @@
<printer translate="name" name="Canon PIXMA MP780" \
driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" \
parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP780" /> <printer \
translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" \
manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" \
foomaticid="Canon-MULTIPASS-MP790" /> <printer translate="name" name="Canon PIXMA \
MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" \
parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP830" \
/>
- <printer translate="name" name="Canon PIXMA MP960" \
driver="bjc-MULTIPASS-MP960" manufacturer="Canon" model="5000960" \
parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP960" /> <printer \
translate="name" name="Canon PIXMA MP970" driver="bjc-MULTIPASS-MP970" \
manufacturer="Canon" model="5000970" parameters="PIXMA_iP4000_params" \
foomaticid="Canon-MULTIPASS-MP970" /> <printer translate="name" name="Canon PIXUS \
iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" \
parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP3100" /> <printer \
translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" \
manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" \
foomaticid="Canon-PIXUS-iP4100" />
["canon-printers.h.diff" (application/octet-stream)]
--- canon-printers.h-mp960 2010-09-29 23:10:13.000000000 +0900
+++ canon-printers.h 2010-09-29 23:15:38.000000000 +0900
@@ -159,7 +159,7 @@
"PEdgeDetection=ON",
NULL
};
-
+
static const char* control_cmd_MULTIPASS_MP150[] = {
"AckTime=Short",
"MediaDetection=ON",
@@ -182,20 +182,6 @@
&canon_PIXMA_iP4000_paperlist,
NULL,
NULL,
- NULL,
- NULL
- },
- { /* Canon PIXMA MP960 */
- "PIXMA MP960", 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_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200, \
/* features */
- &canon_MULTIPASS_MP960_modelist,
- &canon_PIXMA_iP4000_paperlist,
- NULL,
- NULL,
NULL,
NULL
},
["canon-modes.h.diff" (application/octet-stream)]
--- canon-modes.h-mp960 2010-09-29 22:33:53.000000000 +0900
+++ canon-modes.h 2010-09-29 23:16:15.000000000 +0900
@@ -347,14 +347,6 @@
};
DECLARE_MODES(canon_MULTIPASS_MP830,0);
-static const canon_mode_t canon_MULTIPASS_MP960_modes[] = {
- { 300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI \
DRAFT"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
- { 300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 \
DPI"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
- { 600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 \
DPI"),INKSET(19_C3M3Y3K2y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
- { 600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI \
HIGH"),INKSET(19_C6M6Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-};
-DECLARE_MODES(canon_MULTIPASS_MP960,3);
-
static const canon_mode_t canon_MULTIPASS_MP970_modes[] = {
{ 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},
};
["canon-inks.h.diff" (application/octet-stream)]
--- canon-inks.h-mp960 2010-09-29 22:36:44.000000000 +0900
+++ canon-inks.h 2010-09-29 23:15:58.000000000 +0900
@@ -88,6 +88,7 @@
DECLARE_INK(1,2);
+
static const stp_dotsize_t dotsizes_3l[] = {
{ 0x1, 0.5 },
{ 0x2, 1.0 }
@@ -558,72 +559,6 @@
{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},
- {0,0.0,NULL},
- {0,0.0,NULL},
- {0,0.0,NULL},
-};
-
-static const canon_inkset_t canon_19_C6M6Y4K2_inkset[] = {
- {'C',1.0,&canon_4b_6l_ink},
- {'M',1.0,&canon_4b_6l_ink},
- {'Y',1.0,&canon_2b_4l_ink},
- {'K',1.0,&canon_1b_2l_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},
- {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},
- {0,0.0,NULL},
-};
-
-static const canon_inkset_t canon_19_C3M3Y3K2y3_inkset[] = {
- {'C',1.0,&canon_2b_3l_ink},
- {'M',1.0,&canon_2b_3l_ink},
- {'Y',1.0,&canon_2b_3l_ink},
- {'K',1.0,&canon_1b_2l_ink},
- {0,0.0,NULL},
- {0,0.0,NULL},
- {'y',1.0,&canon_2b_3l_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},
- {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_19_C2M2Y2K2_inkset[] = {
- {'C',1.0,&canon_1b_2l_ink},
- {'M',1.0,&canon_1b_2l_ink},
- {'Y',1.0,&canon_1b_2l_ink},
- {'K',1.0,&canon_1b_2l_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},
- {0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Gimp-print-devel mailing list
Gimp-print-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gimp-print-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic