Merge pull request #133 from yaxollum/fix-mfc-7460dn

Fix MFC-7460DN PPD file name

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+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

.gitignore

@@ -1 +1,2 @@
+*~
 build/

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(brlaser CXX)
-set(BRLASER_VERSION "5")
+set(BRLASER_VERSION "6")
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "No build type selected, default to RelWithDebInfo")
@@ -39,10 +39,11 @@ endmacro(extra_cxx_compiler_flag)
 # Compiler warnings
 extra_cxx_compiler_flag("-Wall")
 extra_cxx_compiler_flag("-Wno-missing-braces")
-# Some security flags
+extra_cxx_compiler_flag("-Wdate-time")
+# Some hardening flags
 extra_cxx_compiler_flag("-fstack-protector-strong")
 extra_cxx_compiler_flag("-Wformat")
-extra_cxx_compiler_flag("-Werror=format-security")
+extra_cxx_compiler_flag("-Wformat -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}")
@@ -116,15 +117,17 @@ 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)
+add_dependencies(check test_lest test_line test_block test_job)
 
 
 # Installation

ChangeLog

@@ -1,3 +1,7 @@
+brlaser v6 (2019-09-22)
+    Added support for some more Brother HL-series printers. These printers
+      had glitched output in earlier releases.
+
 brlaser v5 (2019-05-18)
     Fixed problems with Brother HL-series printers in 600 dpi mode. Thanks
       to Onno Kortmann for the fix.

README.md

@@ -10,8 +10,8 @@ source drivers don't work, this one might help.
 
 This driver has been reported to work with these printers:
 
-* Brother DCP-1510
-* Brother DCP-1602
+* Brother DCP-1510 series
+* Brother DCP-1600 series
 * Brother DCP-7030
 * Brother DCP-7040
 * Brother DCP-7055
@@ -19,20 +19,31 @@ This driver has been reported to work with these printers:
 * Brother DCP-7060D
 * Brother DCP-7065DN
 * Brother DCP-7080
-* Brother DCP-L2500D
-* Brother DCP-L2540DW
+* Brother DCP-L2500D series
+* Brother DCP-L2520D series
+* Brother DCP-L2520DW series
+* Brother DCP-L2540DW series
 * Brother HL-1110 series
 * Brother HL-1200 series
+* Brother HL-2030 series
+* Brother HL-2140 series
+* Brother HL-2220 series
+* Brother HL-2270DW series
+* Brother HL-5030 series
 * Brother HL-L2300D series
 * 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
+* Brother MFC-L2710DW series
 * Lenovo M7605D
 
 
@@ -54,7 +65,8 @@ Installation
 ------------
 
 Some operating systems already ship this driver. This is the case for
-at least Debian, Ubuntu, Raspbian, openSUSE, NixOS and Arch Linux.
+at least Debian, Gentoo, Ubuntu, Raspbian, openSUSE, NixOS, Arch Linux 
+and Guix.
 Look for a package named `printer-driver-brlaser`.
 
 You'll also need Ghostscript, in case that's not installed

brlaser.drv.in

@@ -165,6 +165,22 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
   PCFileName "brl2500d.ppd"
 }
 
+{
+  ModelName "DCP-L2520D"
+  Attribute "NickName" "" "Brother DCP-L2520D series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:DCP-L2520D series;CLS:PRINTER;CID:Brother Laser Type1;"
+  Duplex rotated
+  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"
@@ -188,6 +204,43 @@ Option "brlaserEconomode/Toner save mode" Boolean AnySetup 10
   PCFileName "br1200.ppd"
 }
 
+{
+  ModelName "HL-2030 series"
+  Attribute "NickName" "" "Brother HL-2030 series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:HL-2030 series;CLS:PRINTER;"
+  PCFileName "br2030.ppd"
+}
+
+{
+  ModelName "HL-2140 series"
+  Attribute "NickName" "" "Brother HL-2140 series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:HL-2140 series;CLS:PRINTER;"
+  PCFileName "br2140.ppd"
+}
+
+{
+  ModelName "HL-2220 series"
+  Attribute "NickName" "" "Brother HL-2220 series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,HBP;MDL:HL-2220 series;CLS:PRINTER;"
+  PCFileName "br2220.ppd"
+}
+
+{
+  ModelName "HL-2270DW series"
+  Attribute "NickName" "" "Brother HL-2270DW series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,PCL,PCLXL;MDL:HL-2270DW series;CLS:PRINTER;CID:Brother Laser Type1;"
+  Resolution k 1 0 0 0 "300dpi/300 DPI"
+  Duplex rotated
+  PCFileName "br2270dw.ppd"
+}
+
+{
+  ModelName "HL-5030 series"
+  Attribute "NickName" "" "Brother HL-5030 series, $USING"
+  Attribute "1284DeviceID" "" "MFG:Brother;CMD:PJL,PCL;MDL:HL-5030 series;CLS:PRINTER;"
+  PCFileName "br5030.ppd"
+}
+
 {
   ModelName "HL-L2300D"
   Attribute "NickName" "" "Brother HL-L2300D series, $USING"
@@ -220,6 +273,22 @@ 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"
@@ -251,6 +320,21 @@ 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,7 +25,6 @@
 class block {
  public:
   block(): line_bytes_(0) {
-    lines_.reserve(max_lines_per_block_);
   }
 
   bool empty() const {
@@ -40,8 +39,7 @@ class block {
   }
 
   bool line_fits(unsigned size) {
-    return lines_.size() != max_lines_per_block_
-      && line_bytes_ + size < max_block_size_;
+    return line_bytes_ + size < max_block_size_;
   }
 
   void flush(FILE *f) {
@@ -59,7 +57,6 @@ 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,17 +26,18 @@
 job::job(FILE *out, const std::string &job_name)
     : out_(out),
       job_name_(job_name),
-      page_params_() {
+      page_params_(),
+      pages_(0) {
   // 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() {
-  end_job();
+  if (pages_ != 0) {
+    end_job();
+  }
 }
 
 void job::begin_job() {
@@ -86,6 +87,11 @@ 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();
@@ -103,10 +109,20 @@ 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 = encode_line(line, reference);
-    if (!block.line_fits(encoded.size())) {
+    std::vector<uint8_t> encoded;
+    if (i % lines_per_band == 0) {
       block.flush(out_);
+      encoded = encode_line(line);
+    } else {
+      encoded = encode_line(line, reference);
+      if (!block.line_fits(encoded.size())) {
+        block.flush(out_);
+        encoded = encode_line(line);
+      }
     }
     block.add_line(std::move(encoded));
     std::swap(line, reference);

src/job.h

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

src/main.cc

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

test/tempfile.h

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

test/test_block.cc

@@ -37,16 +37,6 @@ 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

@@ -0,0 +1,35 @@
+// 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);
+}