.github/workflows/build.yml

@@ -1,39 +0,0 @@
-name: build
-on: [ push, pull_request ]
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [ clang++, gcc++ ]
-    steps:
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-      - name: Install packages
-        run: sudo apt install libcups2-dev
-      - uses: actions/checkout@v3
-      - name: Configure
-        run: cmake .
-      - name: Make
-        run: make
-        env:
-          CXX: ${{ matrix.compiler }}
-      - name: Run tests
-        run: make check
-  macos:
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [ clang++, gcc++ ]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Configure
-        run: cmake .
-      - name: Make
-        run: make
-        env:
-          CXX: ${{ matrix.compiler }}
-      - name: Run tests
-        run: make check

CMakeLists.txt

@@ -39,11 +39,10 @@ endmacro(extra_cxx_compiler_flag)
 # Compiler warnings
 extra_cxx_compiler_flag("-Wall")
 extra_cxx_compiler_flag("-Wno-missing-braces")
-extra_cxx_compiler_flag("-Wdate-time")
-# Some hardening flags
+# Some security flags
 extra_cxx_compiler_flag("-fstack-protector-strong")
 extra_cxx_compiler_flag("-Wformat")
-extra_cxx_compiler_flag("-Wformat -Werror=format-security")
+extra_cxx_compiler_flag("-Werror=format-security")
 extra_cxx_compiler_flag("-D_FORTIFY_SOURCE=2")
 # Enable the supported flags, but give priority to CXXFLAGS env var
 set(CMAKE_CXX_FLAGS "${EXTRA_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
@@ -117,17 +116,15 @@ add_executable(brdecode EXCLUDE_FROM_ALL src/brdecode.cc)
 add_executable(test_lest test/test_lest.cc)
 add_executable(test_line test/test_line.cc src/line.cc)
 add_executable(test_block test/test_block.cc)
-add_executable(test_job test/test_job.cc src/job.cc src/line.cc)
 
 enable_testing()
 add_test(test_lest test_lest)
 add_test(test_line test_line)
 add_test(test_block test_block)
-add_test(test_job test_job)
 
 # Autotools-style "make check" command
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-add_dependencies(check test_lest test_line test_block test_job)
+add_dependencies(check test_lest test_line test_block)
 
 
 # Installation

README.md

@@ -21,7 +21,6 @@ This driver has been reported to work with these printers:
 * Brother DCP-7080
 * Brother DCP-L2500D series
 * Brother DCP-L2520D series
-* Brother DCP-L2520DW series
 * Brother DCP-L2540DW series
 * Brother HL-1110 series
 * Brother HL-1200 series
@@ -34,14 +33,10 @@ This driver has been reported to work with these printers:
 * Brother HL-L2320D series
 * Brother HL-L2340D series
 * Brother HL-L2360D series
-* Brother HL-L2375DW series
-* Brother HL-L2390DW
 * Brother MFC-1910W
 * Brother MFC-7240
 * Brother MFC-7360N
 * Brother MFC-7365DN
-* Brother MFC-7420
-* Brother MFC-7460DN
 * Brother MFC-7840W
 * Brother MFC-L2710DW series
 * Lenovo M7605D
@@ -65,8 +60,7 @@ Installation
 ------------
 
 Some operating systems already ship this driver. This is the case for
-at least Debian, Gentoo, Ubuntu, Raspbian, openSUSE, NixOS, Arch Linux 
-and Guix.
+at least Debian, Ubuntu, Raspbian, openSUSE, NixOS and Arch Linux.
 Look for a package named `printer-driver-brlaser`.
 
 You'll also need Ghostscript, in case that's not installed

brlaser.drv.in

@@ -173,14 +173,6 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
   PCFileName "brl2520d.ppd"
 }
 
-{
-  ModelName "DCP-L2520DW"
-  Attribute "NickName" "" "Brother DCP-L2520DW series, $USING"
-  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-L2520DW series;CLS:PRINTER;CID:Brother Laser Type1;"
-  Duplex rotated
-  PCFileName "brl2520dw.ppd"
-}
-
 {
   ModelName "DCP-L2540DW"
   Attribute "NickName" "" "Brother DCP-L2540DW series, $USING"
@@ -273,22 +265,6 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
   PCFileName "brl2360d.ppd"
 }
 
-{
-  ModelName "HL-L2375DW"
-  Attribute "NickName" "" "Brother HL-L2375DW series, $USING"
-  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,PCL,PCLXL,URF;MDL:HL-L2375DW series;CLS:PRINTER;CID:Brother Laser Type1;URF:W8,CP1,IS4-1,MT1-3-4-5-8,OB10,PQ3-4-5,RS300-600-1200,V1.4,DM1;"
-  Duplex rotated
-  PCFileName "brl2375w.ppd"
-}
-
-{
-  ModelName "HL-L2390DW"
-  Attribute "NickName" "" "Brother HL-L2390DW, $USING"
-  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP,URF;MDL:HL-L2390DW;CLS:PRINTER;CID:Brother Laser Type1;URF:W8,CP1,IS4-1,MT1-3-4-5-8,OB10,PQ3-4-5,RS300-600-1200,V1.4,DM1;"
-  Duplex rotated
-  PCFileName "brl2390w.ppd"
-}
-
 {
   ModelName "MFC-1910W"
   Attribute "NickName" "" "Brother MFC-1910W, $USING"
@@ -320,21 +296,6 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
   PCFileName "br7365dn.ppd"
 }
 
-{
-  ModelName "MFC-7420"
-  Attribute "NickName" "" "Brother Brother MFC-7420, $USING"
-  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:MFC-7420;CLS:PRINTER;"
-  PCFileName "br7420.ppd"
-}
-
-{
-  ModelName "MFC-7460DN"
-  Attribute "NickName" "" "Brother MFC-7460DN, $USING"
-  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:MFC-7460DN;CLS:PRINTER;CID:Brother Laser Type1;"
-  Duplex rotated
-  PCFileName "br7460dn.ppd"
-}
-
 {
   ModelName "MFC-L2710DW series"
   Attribute "NickName" "" "Brother MFC-L2710DW series, $USING"

src/block.h

@@ -25,6 +25,7 @@
 class block {
  public:
   block(): line_bytes_(0) {
+    lines_.reserve(max_lines_per_block_);
   }
 
   bool empty() const {
@@ -39,7 +40,8 @@ class block {
   }
 
   bool line_fits(unsigned size) {
-    return line_bytes_ + size < max_block_size_;
+    return lines_.size() != max_lines_per_block_
+      && line_bytes_ + size < max_block_size_;
   }
 
   void flush(FILE *f) {
@@ -57,6 +59,7 @@ class block {
 
  private:
   static const unsigned max_block_size_ = 16350;
+  static const unsigned max_lines_per_block_ = 64;
 
   std::vector<std::vector<uint8_t>> lines_;
   int line_bytes_;

src/job.cc

@@ -26,18 +26,17 @@
 job::job(FILE *out, const std::string &job_name)
     : out_(out),
       job_name_(job_name),
-      page_params_(),
-      pages_(0) {
+      page_params_() {
   // Delete dubious characters from job name
   std::replace_if(job_name_.begin(), job_name_.end(), [](char c) {
       return c < 32 || c >= 127 || c == '"' || c == '\\';
     }, ' ');
+
+  begin_job();
 }
 
 job::~job() {
-  if (pages_ != 0) {
-    end_job();
-  }
+  end_job();
 }
 
 void job::begin_job() {
@@ -87,11 +86,6 @@ void job::encode_page(const page_params &page_params,
                       int lines,
                       int linesize,
                       nextline_fn nextline) {
-  if (pages_ == 0) {
-    begin_job();
-  }
-  ++pages_;
-
   if (!(page_params_ == page_params)) {
     page_params_ = page_params;
     write_page_header();
@@ -109,22 +103,14 @@ void job::encode_page(const page_params &page_params,
 
   fputs("\033*b1030m", out_);
 
-  // XXX brother driver uses 128 lines per band
-  const int lines_per_band = 64;
-
   for (int i = 1; i < lines && nextline(line); ++i) {
-    std::vector<uint8_t> encoded;
-    if (i % lines_per_band == 0) {
-      block.flush(out_);
-      encoded = encode_line(line);
+    std::vector<uint8_t> encoded = encode_line(line, reference);
+    if (block.line_fits(encoded.size())) {
+      block.add_line(std::move(encoded));
     } else {
-      encoded = encode_line(line, reference);
-      if (!block.line_fits(encoded.size())) {
-        block.flush(out_);
-        encoded = encode_line(line);
-      }
+      block.flush(out_);
+      block.add_line(encode_line(line));
     }
-    block.add_line(std::move(encoded));
     std::swap(line, reference);
   }
 

src/job.h

@@ -55,10 +55,6 @@ class job {
                    int linesize,
                    nextline_fn nextline);
 
-  int pages() const {
-    return pages_;
-  }
-
  private:
   void begin_job();
   void end_job();
@@ -67,7 +63,6 @@ class job {
   FILE *out_;
   std::string job_name_;
   page_params page_params_;
-  int pages_;
 };
 
 #endif  // JOB_H

src/main.cc

@@ -170,6 +170,7 @@ int main(int argc, char *argv[]) {
     return 1;
   }
 
+  int pages = 0;
   {
     job job(stdout, ascii_job_name(job_id, job_user, job_name));
     cups_page_header2_t header;
@@ -178,11 +179,11 @@ int main(int argc, char *argv[]) {
           || header.cupsBitsPerColor != 1
           || header.cupsNumColors != 1
           || header.cupsBytesPerLine > 10000) {
-        fprintf(stderr, "ERROR: " PACKAGE ": Page %d: Bogus raster data.\n", job.pages() + 1);
+        fprintf(stderr, "ERROR: " PACKAGE ": Page %d: Bogus raster data.\n", pages + 1);
         dump_page_header(header);
         return 1;
       }
-      if (job.pages() == 0) {
+      if (pages == 0) {
         fprintf(stderr, "DEBUG: " PACKAGE ": Page header of first page\n");
         dump_page_header(header);
       }
@@ -190,12 +191,13 @@ int main(int argc, char *argv[]) {
                       header.cupsHeight,
                       header.cupsBytesPerLine,
                       next_line);
-      fprintf(stderr, "PAGE: %d %d\n", job.pages(), header.NumCopies);
+      fprintf(stderr, "PAGE: %d %d\n", ++pages, header.NumCopies);
     }
+  }
 
-    if (job.pages() == 0) {
-      fprintf(stderr, "ERROR: " PACKAGE ": No pages were found.\n");
-    }
+  if (pages == 0) {
+    fprintf(stderr, "ERROR: " PACKAGE ": No pages were found.\n");
+    return 1;
   }
 
   fflush(stdout);

test/tempfile.h

@@ -18,7 +18,6 @@
 #ifndef TEMPFILE_H
 #define TEMPFILE_H
 
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <vector>

test/test_block.cc

@@ -37,6 +37,16 @@ const lest::test specification[] = {
     EXPECT(!b.empty());
   },
 
+  "A block can contain 64 lines",
+  [] {
+    block b;
+    for (int i = 0; i < 64; ++i) {
+      EXPECT(b.line_fits(1));
+      b.add_line(vec(1));
+    }
+    EXPECT(!b.line_fits(1));
+  },
+
   "A block has a size limit of about 16 kilobyte",
   [] {
     block b;

test/test_job.cc

@@ -1,35 +0,0 @@
-// This file is part of the brlaser printer driver.
-//
-// Copyright 2020 Peter De Wachter
-//
-// brlaser is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-//
-// brlaser is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with brlaser.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "lest.hpp"
-#include "tempfile.h"
-#include "../src/job.h"
-
-const lest::test specification[] = {
-  "An empty job produces no output",
-  [] {
-    tempfile f;
-    {
-      job j(f.file(), "name");
-    }
-    EXPECT(f.data().empty());
-  },
-};
-
-int main() {
-  return lest::run(specification);
-}