Add patches to enable multicut modes in Gutenprint.

This commit is contained in:
Solomon Peachy 2015-01-29 13:07:28 -05:00
parent 746e3feebb
commit 6bc18eebdb
3 changed files with 273 additions and 0 deletions

9
misc-patches/README Normal file
View File

@ -0,0 +1,9 @@
Here you will find patches against Gutenprint that enables multicut support
for every model that I'm aware of.
This code is not mainlined, and isn't likely to be in its current state.
If you are going to patch gutenprint and compile it yourself, I highly
recommend using the latest code out of CVS, available here:
http://sourceforge.net/p/gimp-print/code/

View File

@ -0,0 +1,129 @@
Index: src/main/print-olympus.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v
retrieving revision 1.165
diff -u -r1.165 print-olympus.c
--- src/main/print-olympus.c 7 May 2014 11:16:56 -0000 1.165
+++ src/main/print-olympus.c 21 May 2014 01:48:31 -0000
@@ -29,6 +29,7 @@
* compile on generic platforms that don't support glib, gimp, gtk, etc.
*/
+#define DNPX2
/* #define DNPX2 */
#ifdef HAVE_CONFIG_H
Index: src/xml/papers.xml
===================================================================
RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v
retrieving revision 1.16
diff -u -r1.16 papers.xml
--- src/xml/papers.xml 22 Jan 2014 13:52:41 -0000 1.16
+++ src/xml/papers.xml 21 May 2014 01:48:31 -0000
@@ -140,6 +140,12 @@
<height value="432"/>
<unit value="english"/>
</paper>
+ <paper name="2x6_x2">
+ <description translate="value" value="2x6*2"/>
+ <width value="288"/>
+ <height value="432"/>
+ <unit value="english"/>
+ </paper>
<paper name="w288h432J">
<description translate="value" value="KG"/>
<width value="288"/>
@@ -178,6 +184,12 @@
<height value="504"/>
<unit value="english-extended"/>
</paper>
+ <paper name="B7_x2">
+ <description translate="value" value="3.5x5*2"/>
+ <width value="360"/>
+ <height value="504"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w360h504J">
<description translate="value" value="2L"/>
<width value="360"/>
@@ -202,6 +214,12 @@
<height value="576"/>
<unit value="english-extended"/>
</paper>
+ <paper name="4x6_x2">
+ <description translate="value" value="4x6*2"/>
+ <width value="432"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w432h612">
<description translate="value" value="6x8.5"/>
<width value="432"/>
@@ -214,12 +232,42 @@
<height value="648"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x4_x2">
+ <description translate="value" value="8x4*2"/>
+ <width value="576"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="c8x10">
<description translate="value" value="8x10"/>
<width value="576"/>
<height value="720"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x5_x2">
+ <description translate="value" value="8x5*2"/>
+ <width value="576"/>
+ <height value="720"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x6_8x4">
+ <description translate="value" value="8x6+8x4"/>
+ <width value="576"/>
+ <height value="720"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x5_8x4">
+ <description translate="value" value="8x6+8x5"/>
+ <width value="576"/>
+ <height value="792"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x6_8x5">
+ <description translate="value" value="8x5+8x4"/>
+ <width value="576"/>
+ <height value="648"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="c8x10J">
<description translate="value" value="Rokukire"/>
<comment value="Same size as 8x10"/>
@@ -269,6 +317,24 @@
<height value="864"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x6_x2">
+ <description translate="value" value="8x6*2"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x8_8x4">
+ <description translate="value" value="8x8+8x4"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x4_x3">
+ <description translate="value" value="8x4*3"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w612h864">
<description translate="value" value="8.5x12"/>
<comment value="8.5in x 12in"/>

View File

@ -0,0 +1,135 @@
Index: src/main/print-olympus.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v
retrieving revision 1.180
diff -u -r1.180 print-olympus.c
--- src/main/print-olympus.c 10 Jan 2015 14:37:07 -0000 1.180
+++ src/main/print-olympus.c 10 Jan 2015 14:39:10 -0000
@@ -46,6 +46,7 @@
it. Be warned that you will also need a patch to papers.xml to define
the additional paper types. */
/* #define MULTICUT */
+#define MULTICUT
#define DYESUB_FEATURE_NONE 0x00000000
#define DYESUB_FEATURE_FULL_WIDTH 0x00000001
Index: src/xml/papers.xml
===================================================================
RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v
retrieving revision 1.18
diff -u -r1.18 papers.xml
--- src/xml/papers.xml 20 Oct 2014 03:27:40 -0000 1.18
+++ src/xml/papers.xml 10 Jan 2015 14:39:10 -0000
@@ -146,6 +146,12 @@
<height value="432"/>
<unit value="english"/>
</paper>
+ <paper name="2x6_x2">
+ <description translate="value" value="2x6*2"/>
+ <width value="288"/>
+ <height value="432"/>
+ <unit value="english"/>
+ </paper>
<paper name="w288h432J">
<description translate="value" value="KG"/>
<width value="288"/>
@@ -190,6 +196,12 @@
<height value="504"/>
<unit value="english-extended"/>
</paper>
+ <paper name="B7_x2">
+ <description translate="value" value="3.5x5*2"/>
+ <width value="360"/>
+ <height value="504"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w360h504J">
<description translate="value" value="2L"/>
<width value="360"/>
@@ -214,6 +226,18 @@
<height value="576"/>
<unit value="english-extended"/>
</paper>
+ <paper name="4x6_x2">
+ <description translate="value" value="4x6*2"/>
+ <width value="432"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="4x6_2x6">
+ <description translate="value" value="4x6+2x6"/>
+ <width value="432"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w432h612">
<description translate="value" value="6x8.5"/>
<width value="432"/>
@@ -226,12 +250,42 @@
<height value="648"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x4_x2">
+ <description translate="value" value="8x4*2"/>
+ <width value="576"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="c8x10">
<description translate="value" value="8x10"/>
<width value="576"/>
<height value="720"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x5_x2">
+ <description translate="value" value="8x5*2"/>
+ <width value="576"/>
+ <height value="720"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x6_8x4">
+ <description translate="value" value="8x6+8x4"/>
+ <width value="576"/>
+ <height value="720"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x5_8x4">
+ <description translate="value" value="8x6+8x5"/>
+ <width value="576"/>
+ <height value="792"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x6_8x5">
+ <description translate="value" value="8x5+8x4"/>
+ <width value="576"/>
+ <height value="648"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="c8x10J">
<description translate="value" value="Rokukire"/>
<comment value="Same size as 8x10"/>
@@ -287,6 +341,24 @@
<height value="864"/>
<unit value="english-extended"/>
</paper>
+ <paper name="8x6_x2">
+ <description translate="value" value="8x6*2"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x8_8x4">
+ <description translate="value" value="8x8+8x4"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="8x4_x3">
+ <description translate="value" value="8x4*3"/>
+ <width value="576"/>
+ <height value="864"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w612h864">
<description translate="value" value="8.5x12"/>
<comment value="8.5in x 12in"/>