diff options
author | Roger Leigh <rleigh@debian.org> | 2012-07-09 23:15:00 +0100 |
---|---|---|
committer | Roger Leigh <rleigh@debian.org> | 2012-07-09 23:15:00 +0100 |
commit | ccd50c2bd4db57503722816aa23a5092cbe69f40 (patch) | |
tree | 7b2fffb9ec06a2f0fcf3b25dba66cc04409db70e /src/main | |
parent | 3514df18b289ec827cb6e4c446419feab1813231 (diff) |
Imported Upstream version 5.2.9
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Makefile.in | 1 | ||||
-rw-r--r-- | src/main/canon-media-mode.h | 3 | ||||
-rw-r--r-- | src/main/canon-media.h | 13 | ||||
-rw-r--r-- | src/main/print-escp2.c | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/main/Makefile.in b/src/main/Makefile.in index 9b05bf3..6dfeb32 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -307,6 +307,7 @@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@ LIBS = $(INTLLIBS) @LIBS@ diff --git a/src/main/canon-media-mode.h b/src/main/canon-media-mode.h index 3052f8e..7025510 100644 --- a/src/main/canon-media-mode.h +++ b/src/main/canon-media-mode.h @@ -10112,8 +10112,7 @@ DECLARE_MODEUSES(canon_PIXMA_MG8200); /* ----------------------------------- Canon Pro9000 ----------------------------------- */
static const char* canon_PIXMA_Pro9000_modeuses_plain[] = {
- "600x600dpi_hig2",
- "600x600dpi_high",
+ "600x600dpi_high2",
"600x600dpi",
"600x600dpi_std2",
"600x600dpi_draft",
diff --git a/src/main/canon-media.h b/src/main/canon-media.h index 4b47916..7fc3bf7 100644 --- a/src/main/canon-media.h +++ b/src/main/canon-media.h @@ -113,7 +113,7 @@ static const canon_slot_t canon_MULTIPASS_MP250_slots[] = { DECLARE_SLOTS(canon_MULTIPASS_MP250); static const canon_slot_t canon_PIXMA_MG2100_slots[] = { - { "Front", N_ ("Front tray"), 0x8 }, + { "Front", N_ ("Front tray"), 0x8 }, }; DECLARE_SLOTS(canon_PIXMA_MG2100); @@ -145,13 +145,13 @@ static const canon_slot_t canon_BJC_S800_slots[] = { DECLARE_SLOTS(canon_BJC_S800); static const canon_slot_t canon_MULTIPASS_MX7600_slots[] = { - { "Cassette", N_ ("Cassette"), 0x8 }, + { "Cassette", N_ ("Cassette"), 0x8 }, }; DECLARE_SLOTS(canon_MULTIPASS_MX7600); static const canon_slot_t canon_PIXMA_iX7000_slots[] = { { "Cassette", N_ ("Cassette"), 0x8 }, - { "HandFeed", N_ ("Hand Feeding"), 0x1 }, + { "HandFeed", N_ ("Hand Feeding"), 0x1 }, { "Rear", N_ ("Rear tray"), 0x4 }, }; DECLARE_SLOTS(canon_PIXMA_iX7000); @@ -178,14 +178,14 @@ DECLARE_SLOTS(canon_MULTIPASS_MX850); static const canon_slot_t canon_MULTIPASS_MP520_slots[] = { { "SelectKey", N_ ("Selected by Paper Select Key"), 0x3 }, { "Rear", N_ ("Rear tray"), 0x4 }, - { "Front", N_ ("Front tray"), 0x8 }, + { "Front", N_ ("Front tray"), 0x8 }, /* There is also a "plain media only Front" option, but it seems to have same 0x8 when used, no idea whether it should take different values */ }; DECLARE_SLOTS(canon_MULTIPASS_MP520); static const canon_slot_t canon_PIXMA_iP3500_slots[] = { { "Rear", N_ ("Rear tray"), 0x4 }, - { "Front", N_ ("Front tray"), 0x8 }, + { "Front", N_ ("Front tray"), 0x8 }, /* There is also a "plain media only Front" option, but it seems to have same 0x8 when used, no idea whether it should take different values */ }; DECLARE_SLOTS(canon_PIXMA_iP3500); @@ -211,7 +211,7 @@ DECLARE_SLOTS(canon_PIXMA_iP4600); /* Pro9000, Pro9500 series */ static const canon_slot_t canon_PIXMA_Pro9000_slots[] = { { "Rear", N_ ("Rear tray"), 0x4 }, - { "Front", N_ ("Front tray"), 0xb }, + { "Front", N_ ("Front tray"), 0xb }, { "CD", N_ ("CD tray"), 0xa }, }; DECLARE_SLOTS(canon_PIXMA_Pro9000); @@ -374,7 +374,6 @@ static const canon_paper_t canon_PIXMA_iP4100_papers[] = { { "DiscOthers", N_ ("Printable Disc (Other)"), 0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, { "TShirt", N_ ("T-Shirt Transfers"), 0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, { "Envelope", N_ ("Envelope"), 0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, - { "Transparency", N_ ("Transparencies"), 0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 }, { "PhotopaperOther", N_ ("Other Photo Paper"), 0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */ { "Transparency", N_ ("Transparencies"), 0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */ }; diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c index 3c95d8e..07effa8 100644 --- a/src/main/print-escp2.c +++ b/src/main/print-escp2.c @@ -1,5 +1,5 @@ /* - * "$Id: print-escp2.c,v 1.438 2012/01/19 13:26:28 m0m Exp $" + * "$Id: print-escp2.c,v 1.439 2012/06/16 03:10:56 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -2304,8 +2304,8 @@ escp2_parameters(const stp_vars_t *v, const char *name, strcmp(name, "CDYAdjustment") == 0) { const input_slot_t *slot = stp_escp2_get_input_slot(v); - description->bounds.dimension.lower = -15; - description->bounds.dimension.upper = 15; + description->bounds.dimension.lower = -30; + description->bounds.dimension.upper = 30; description->deflt.dimension = 0; if (stp_escp2_printer_supports_print_to_cd(v) && (!slot || slot->is_cd)) description->is_active = 1; |