Drop support for old HP DeskJet CRet mode that has not been supported by RIPs for...

diff --git a/data/hp.h b/data/hp.h
index 64d6d20b65fc5f0e6b800125b090c0ba915ac5b8..09a4f7e19b84483c86c16fd3d6b566eb204d6af4 100644 (file)
--- a/data/hp.h
+++ b/data/hp.h
@@ -2,13 +2,13 @@
  * This file contains model number definitions for the CUPS sample
  * HP driver.
  *
- * Copyright © 2020-2024 by OpenPrinting.
- * Copyright 2007 by Apple Inc.
- * Copyright 1997-2005 by Easy Software Products.
+ * Copyright © 2020-2026 by OpenPrinting.
+ * Copyright © 2007 by Apple Inc.
+ * Copyright © 1997-2005 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #define HP_LASERJET    0               /* HP LaserJet */
 #define HP_DESKJET     1               /* HP DeskJet with simple color */
-#define HP_DESKJET2    2               /* HP DeskJet with CRet color */

diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 05af10e64f0f8e21e230e368bf50ca3ad55450c9..3d0eb6c705a40475c8a661394243403247ef6716 100644 (file)
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -29,10 +29,8 @@
  */
 
 unsigned char  *Planes[4],             /* Output buffers */
-               *CompBuffer,            /* Compression buffer */
-               *BitBuffer;             /* Buffer for output bits */
+               *CompBuffer;            /* Compression buffer */
 unsigned       NumPlanes,              /* Number of color planes */
-               ColorBits,              /* Number of bits per color */
                Feed;                   /* Number of lines to skip */
 cups_bool_t    Duplex;                 /* Current duplex mode */
 int            Page,                   /* Current page number */
@@ -108,26 +106,13 @@ StartPage(ppd_file_t         *ppd,        /* I - PPD file */
   * Setup printer/job attributes...
   */
 
-  Duplex    = header->Duplex;
-  ColorBits = header->cupsBitsPerColor;
+  Duplex = header->Duplex;
 
   if ((!Duplex || (Page & 1)) && header->MediaPosition)
     printf("\033&l%dH",                                /* Set media position */
            header->MediaPosition);
 
-  if (Duplex && ppd && ppd->model_number == 2)
-  {
-   /*
-    * Handle duplexing on new DeskJet printers...
-    */
-
-    printf("\033&l-2H");                       /* Load media */
-
-    if (Page & 1)
-      printf("\033&l2S");                      /* Set duplex mode */
-  }
-
-  if (!Duplex || (Page & 1) || (ppd && ppd->model_number == 2))
+  if (!Duplex || (Page & 1))
   {
    /*
     * Set the media size...
@@ -198,120 +183,56 @@ StartPage(ppd_file_t         *ppd,       /* I - PPD file */
     * Set other job options...
     */
 
+    int mode = Duplex ? 1 + header->Tumble != 0 : 0;
+                                               /* Duplex mode */
+
     printf("\033&l%dX", header->NumCopies);    /* Set number copies */
 
-    if (header->cupsMediaType &&
-        (!ppd || ppd->model_number != 2 || header->HWResolution[0] == 600))
+    if (header->cupsMediaType && header->HWResolution[0] == 600)
       printf("\033&l%dM",                      /* Set media type */
              header->cupsMediaType);
 
-    if (!ppd || ppd->model_number != 2)
-    {
-      int mode = Duplex ? 1 + header->Tumble != 0 : 0;
-
-      printf("\033&l%dS", mode);               /* Set duplex mode */
-      printf("\033&l0L");                      /* Turn off perforation skip */
-    }
+    printf("\033&l%dS", mode);                 /* Set duplex mode */
+    printf("\033&l0L");                                /* Turn off perforation skip */
   }
-  else if (!ppd || ppd->model_number != 2)
+  else
+  {
     printf("\033&a2G");                                /* Set back side */
+  }
 
  /*
   * Set graphics mode...
   */
 
-  if (ppd && ppd->model_number == 2)
-  {
-   /*
-    * Figure out the number of color planes...
-    */
-
-    if (header->cupsColorSpace == CUPS_CSPACE_KCMY)
-      NumPlanes = 4;
-    else
-      NumPlanes = 1;
-
-   /*
-    * Set the resolution and top-of-form...
-    */
-
-    printf("\033&u%dD", header->HWResolution[0]);
-                                               /* Resolution */
-    printf("\033&l0e0L");                      /* Reset top and don't skip */
-    printf("\033*p0Y\033*p0X");                        /* Set top of form */
-
-   /*
-    * Send 26-byte configure image data command with horizontal and
-    * vertical resolutions as well as a color count...
-    */
+  printf("\033*t%uR", header->HWResolution[0]);        /* Set resolution */
 
-    printf("\033*g26W");
-    putchar(2);                                        /* Format 2 */
-    putchar((int)NumPlanes);                   /* Output planes */
-
-    putchar((int)(header->HWResolution[0] >> 8));/* Black resolution */
-    putchar((int)header->HWResolution[0]);
-    putchar((int)(header->HWResolution[1] >> 8));
-    putchar((int)header->HWResolution[1]);
-    putchar(0);
-    putchar(1 << ColorBits);                   /* # of black levels */
-
-    putchar((int)(header->HWResolution[0] >> 8));/* Cyan resolution */
-    putchar((int)header->HWResolution[0]);
-    putchar((int)(header->HWResolution[1] >> 8));
-    putchar((int)header->HWResolution[1]);
-    putchar(0);
-    putchar(1 << ColorBits);                   /* # of cyan levels */
-
-    putchar((int)(header->HWResolution[0] >> 8));/* Magenta resolution */
-    putchar((int)header->HWResolution[0]);
-    putchar((int)(header->HWResolution[1] >> 8));
-    putchar((int)header->HWResolution[1]);
-    putchar(0);
-    putchar(1 << ColorBits);                   /* # of magenta levels */
-
-    putchar((int)(header->HWResolution[0] >> 8));/* Yellow resolution */
-    putchar((int)header->HWResolution[0]);
-    putchar((int)(header->HWResolution[1] >> 8));
-    putchar((int)header->HWResolution[1]);
-    putchar(0);
-    putchar(1 << ColorBits);                   /* # of yellow levels */
-
-    printf("\033&l0H");                                /* Set media position */
+  if (header->cupsColorSpace == CUPS_CSPACE_KCMY)
+  {
+    NumPlanes = 4;
+    printf("\033*r-4U");                       /* Set KCMY graphics */
   }
-  else
+  else if (header->cupsColorSpace == CUPS_CSPACE_CMY)
   {
-    printf("\033*t%uR", header->HWResolution[0]);
-                                               /* Set resolution */
-
-    if (header->cupsColorSpace == CUPS_CSPACE_KCMY)
-    {
-      NumPlanes = 4;
-      printf("\033*r-4U");                     /* Set KCMY graphics */
-    }
-    else if (header->cupsColorSpace == CUPS_CSPACE_CMY)
-    {
-      NumPlanes = 3;
-      printf("\033*r-3U");                     /* Set CMY graphics */
-    }
-    else
-      NumPlanes = 1;                           /* Black&white graphics */
+    NumPlanes = 3;
+    printf("\033*r-3U");                       /* Set CMY graphics */
+  }
+  else
+    NumPlanes = 1;                             /* Black&white graphics */
 
-   /*
-    * Set size and position of graphics...
-    */
+ /*
+  * Set size and position of graphics...
+  */
 
-    printf("\033*r%uS", header->cupsWidth);    /* Set width */
-    printf("\033*r%uT", header->cupsHeight);   /* Set height */
+  printf("\033*r%uS", header->cupsWidth);      /* Set width */
+  printf("\033*r%uT", header->cupsHeight);     /* Set height */
 
-    printf("\033&a0H");                                /* Set horizontal position */
+  printf("\033&a0H");                          /* Set horizontal position */
 
-    if (ppd)
-      printf("\033&a%.0fV",                    /* Set vertical position */
-             10.0 * (ppd->sizes[0].length - ppd->sizes[0].top));
-    else
-      printf("\033&a0V");                      /* Set top-of-page */
-  }
+  if (ppd)
+    printf("\033&a%.0fV",                      /* Set vertical position */
+          10.0 * (ppd->sizes[0].length - ppd->sizes[0].top));
+  else
+    printf("\033&a0V");                                /* Set top-of-page */
 
   printf("\033*r1A");                          /* Start graphics */
 
@@ -334,11 +255,6 @@ StartPage(ppd_file_t         *ppd, /* I - PPD file */
   for (plane = 1; plane < NumPlanes; plane ++)
     Planes[plane] = Planes[0] + plane * header->cupsBytesPerLine / NumPlanes;
 
-  if (ColorBits > 1)
-    BitBuffer = malloc((size_t)ColorBits * (((size_t)header->cupsWidth + 7) / 8));
-  else
-    BitBuffer = NULL;
-
   if (header->cupsCompression)
     CompBuffer = packbits_alloc(header->cupsBytesPerLine);
   else
@@ -380,9 +296,6 @@ EndPage(void)
 
   free(Planes[0]);
 
-  if (BitBuffer)
-    free(BitBuffer);
-
   if (CompBuffer)
     free(CompBuffer);
 }
@@ -495,13 +408,7 @@ void
 OutputLine(cups_page_header2_t *header)        /* I - Page header */
 {
   unsigned     plane,                  /* Current plane */
-               bytes,                  /* Bytes to write */
-               count;                  /* Bytes to convert */
-  unsigned char        bit,                    /* Current plane data */
-               bit0,                   /* Current low bit data */
-               bit1,                   /* Current high bit data */
-               *plane_ptr,             /* Pointer into Planes */
-               *bit_ptr;               /* Pointer into BitBuffer */
+               bytes;                  /* Bytes to write */
 
 
  /*
@@ -521,51 +428,7 @@ OutputLine(cups_page_header2_t *header)    /* I - Page header */
   bytes = (header->cupsWidth + 7) / 8;
 
   for (plane = 0; plane < NumPlanes; plane ++)
-    if (ColorBits == 1)
-    {
-     /*
-      * Send bits as-is...
-      */
-
-      CompressData(Planes[plane], bytes, plane < (NumPlanes - 1) ? 'V' : 'W',
-                  header->cupsCompression);
-    }
-    else
-    {
-     /*
-      * Separate low and high bit data into separate buffers.
-      */
-
-      for (count = header->cupsBytesPerLine / NumPlanes,
-               plane_ptr = Planes[plane], bit_ptr = BitBuffer;
-          count > 0;
-          count -= 2, plane_ptr += 2, bit_ptr ++)
-      {
-        bit = plane_ptr[0];
-
-        bit0 = (unsigned char)(((bit & 64) << 1) | ((bit & 16) << 2) | ((bit & 4) << 3) | ((bit & 1) << 4));
-        bit1 = (unsigned char)((bit & 128) | ((bit & 32) << 1) | ((bit & 8) << 2) | ((bit & 2) << 3));
-
-        if (count > 1)
-       {
-         bit = plane_ptr[1];
-
-          bit0 |= (unsigned char)((bit & 1) | ((bit & 4) >> 1) | ((bit & 16) >> 2) | ((bit & 64) >> 3));
-          bit1 |= (unsigned char)(((bit & 2) >> 1) | ((bit & 8) >> 2) | ((bit & 32) >> 3) | ((bit & 128) >> 4));
-       }
-
-        bit_ptr[0]     = bit0;
-       bit_ptr[bytes] = bit1;
-      }
-
-     /*
-      * Send low and high bits...
-      */
-
-      CompressData(BitBuffer, bytes, 'V', header->cupsCompression);
-      CompressData(BitBuffer + bytes, bytes, plane < (NumPlanes - 1) ? 'V' : 'W',
-                  header->cupsCompression);
-    }
+    CompressData(Planes[plane], bytes, plane < (NumPlanes - 1) ? 'V' : 'W', header->cupsCompression);
 
   fflush(stdout);
 }

diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 82d68549e4a9b5f3f0fe89e7a1bc688b40ef6a73..d2efad017c4f1f0e1df2e2d03895c4d659796513 100644 (file)
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,7 +1,7 @@
 //
 // Source class for the CUPS PPD Compiler.
 //
-// Copyright © 2020-2024 by OpenPrinting.
+// Copyright © 2020-2026 by OpenPrinting.
 // Copyright © 2007-2018 by Apple Inc.
 // Copyright © 2002-2007 by Easy Software Products.
 //
@@ -3593,10 +3593,6 @@ ppdcSource::write_file(const char *f)    // I - File to write
                  cupsFilePuts(fp, "$HP_DESKJET\n");
                  break;
 
-             case HP_DESKJET2 :
-                 cupsFilePuts(fp, "$HP_DESKJET2\n");
-                 break;
-
              default :
                  cupsFilePrintf(fp, "%d\n", d->model_number);
                  break;