[Gimp-print-devel] Canon bug

[Robert L K. <rl...@al...>]

I believe that the following will fix (for now) the Canon bug reported
earlier this evening (it tested out OK in my sandbox).  There's a
broader issue, though; the fact that the Gimp plugin (and the verify
routine) allow color printing to be done with a printer setup that
shouldn't permit it.

Is it possible for Canon printers to have only a black cartridge
installed?  If not, should Black be a valid ink choice on color
printers?

Index: print-canon.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-canon.c,v
retrieving revision 1.67
diff -c -r1.67 print-canon.c
*** print-canon.c	2001/09/08 17:13:48	1.67
--- print-canon.c	2001/09/29 02:17:34
***************
*** 2250,2256 ****
  
    if ((printhead == 0 || caps->inks == CANON_INK_K) &&
        output_type != OUTPUT_MONOCHROME)
!     output_type = OUTPUT_GRAY;
  
    if (output_type == OUTPUT_GRAY || output_type == OUTPUT_MONOCHROME)
      colormode = COLOR_MONOCHROME;
--- 2250,2259 ----
  
    if ((printhead == 0 || caps->inks == CANON_INK_K) &&
        output_type != OUTPUT_MONOCHROME)
!     {
!       output_type = OUTPUT_GRAY;
!       stp_set_output_type(nv, output_type);
!     }
  
    if (output_type == OUTPUT_GRAY || output_type == OUTPUT_MONOCHROME)
      colormode = COLOR_MONOCHROME;
***************
*** 2569,2575 ****
      stp_dither(out, y, dither, cyan, lcyan, magenta, lmagenta,
  	       yellow, 0, black, duplicate_line, zero_mask);
  
!     canon_write_line(v, caps, ydpi,
  		     black,    delay_k,
  		     cyan,     delay_c,
  		     magenta,  delay_m,
--- 2572,2578 ----
      stp_dither(out, y, dither, cyan, lcyan, magenta, lmagenta,
  	       yellow, 0, black, duplicate_line, zero_mask);
  
!     canon_write_line(nv, caps, ydpi,
  		     black,    delay_k,
  		     cyan,     delay_c,
  		     magenta,  delay_m,
***************
*** 2608,2614 ****
  	    delay_max);
      for (y= 0; y<delay_max; y++) {
  
!       canon_write_line(v, caps, ydpi,
  		       black,    delay_k,
  		       cyan,     delay_c,
  		       magenta,  delay_m,
--- 2611,2617 ----
  	    delay_max);
      for (y= 0; y<delay_max; y++) {
  
!       canon_write_line(nv, caps, ydpi,
  		       black,    delay_k,
  		       cyan,     delay_c,
  		       magenta,  delay_m,
***************
*** 2644,2650 ****
    if (lmagenta != NULL) stp_free(lmagenta);
    if (lyellow != NULL)  stp_free(lyellow);
  
!   canon_deinit_printer(v, &init);
    stp_free_vars(nv);
  }
  
--- 2647,2653 ----
    if (lmagenta != NULL) stp_free(lmagenta);
    if (lyellow != NULL)  stp_free(lyellow);
  
!   canon_deinit_printer(nv, &init);
    stp_free_vars(nv);
  }