Merge branch 'de-gpl'

Addresses #605

.github/issue_template.md

@@ -9,17 +9,16 @@ ocrmypdf  ...arguments... input.pdf output.pdf
 ```
 
 **Example file**
-Please include an example *input* PDF (or image). The input file is more helpful.
+Please include an example *input* PDF (or image). You could also try to use of the files in ``tests/resources/`` to illustrate your issue.
 
-Please check any or all that apply about the test file:
+Please check any or all that apply about the example file:
 
 - [ ] This is the input file
 - [ ] The file contains no personal or confidential information
-- [ ] I am the copyright holder for this file
-- [ ] I permit this file to be included in the OCRmyPDF test suite under the CC-BY-SA 4.0 license
-- [ ] I am not the copyright holder, but this file is available under a free software license
 
-Files that are not free for inclusion in this project are quite welcome, but we like to collect free files for our test suite when possible. Please do *not* submit files with confidential information. At your option you may encrypt files for OCRmyPDF's author only.
+Please do *not* submit files with confidential information. At your option you may encrypt files for OCRmyPDF's author only.
+
+Issues submitted without an example input file are less likely to be resolved. The output file is generally not helpful.
 
 **Expected behavior**
 A clear and concise description of what you expected to happen. Include screenshots if applicable.
@@ -27,7 +26,7 @@ A clear and concise description of what you expected to happen. Include screensh
 **System:**
 
 - OS: [e.g. Linux, macOS]
-- OCRmyPDF Version: [e.g. v7.4.0]
+- OCRmyPDF Version: [e.g. v10.3.0]
 
 **Additional context**
 Add any other context about the problem here.

README.md

@@ -127,11 +127,15 @@ OCRmyPDF would not be the software that it is today without companies and users
 
 ## License
 
-The OCRmyPDF software is licensed under the GNU GPLv3. Certain files are covered by other licenses, as noted in their source files.
+The OCRmyPDF software is licensed under the Mozilla Public License 2.0
+(MPL-2.0). This license permits integration of OCRmyPDF with other code,
+included commercial and closed source, but asks you to publish source-level
+modifications you make to OCRmyPDF.
 
-The license for each test file varies, and is noted in tests/resources/README.rst. The documentation is licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA 4.0).
+Some components of OCRmyPDF have other licenses, as noted in those files and the
-
+``debian/copyright`` file. Most files in ``misc/`` use the MIT license, and the
-OCRmyPDF versions prior to 6.0 were distributed under the MIT License.
+documentation and test files are generally licensed under Creative Commons
+ShareAlike 4.0 (CC-BY-SA 4.0).
 
 ## Disclaimer
 

debian/copyright

@@ -5,15 +5,42 @@ Source: https://github.com/jbarlow83/OCRmyPDF
 
 Files: *
 Copyright:
- (C) 2013-2017 The OCRmyPDF Authors
+ (C) 2013-2015 Julien Pfefferkorn
- (C) 2013-2016, 2015-2017 2016, 2017, 2017-2018, 2018 James R. Barlow
+ (C) 2015-2020 James R. Barlow
-License: GPL-3+
+ (C) 2019 Martin Wind
+License: MPL-2.0
+
+Files: misc/*
+Copyright:
+ (C) 2020 James R. Barlow
+License: Expat
+
+Files: misc/completion/ocrmypdf.bash
+Copyright:
+ (C) 2019 Frank Pille
+ (C) 2020 Alex Willner
+License: Expat
+
+Files: misc/completion/ocrmypdf.fish
+Copyright:
+ (C) 2020 James R. Barlow
+License: Expat
+
+Files: misc/batch.py
+Copyright:
+ (C) 2016 findingorder: https://github.com/findingorder
+License: Expat
+
+Files: misc/synology.py
+Copyright:
+ (C) github.com/Enantiomerie
+License: Expat
 
 Files: misc/watcher.py
 Copyright:
  (C) 2019 Ian Alexander: https://github.com/ianalexander
  (C) 2020 James R. Barlow
-License: GPL-3+
+License: Expat
 
 Files: misc/webservice.py
 Copyright: (C) 2019 James R. Barlow
@@ -43,7 +70,7 @@ Copyright: (C) 2014 Armin Ronacher
  (C) 2017 James R. Barlow
 License: BSD-3-clause
 
-Files: tests/spoof/*
+Files: tests/plugins/*
 Copyright: (C) 2016, 2017, 2016-2018 James R. Barlow
 License: Expat
 
@@ -132,6 +159,13 @@ Files: debian/*
 Copyright: (C) 2016 Sean Whitton <spwhitton@spwhitton.name>
 License: GPL-3+
 
+License: MPL-2.0
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0.
+ .
+ On Debian systems the full text of the MPL-2.0 can be found in
+ /usr/share/common-licenses/MPL-2.0.
+
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

docs/api.rst

@@ -51,6 +51,10 @@ Forking a child process to call ``ocrmypdf.ocr()`` is suggested. That
 way your application will survive and remain interactive even if
 OCRmyPDF does not.
 
+Programs that call ``ocrmypdf.ocr()`` should also install a SIGBUS signal
+handler (except on Windows), to raise an exception if access to a memory
+mapped file fails. OCRmyPDF may use memory mapping.
+
 .. warning::
 
     On Windows, the script that calls ``ocrmypdf.ocr()`` must be protected

docs/contributing.rst

@@ -32,7 +32,8 @@ If you are proposing a change that will require a new Python dependency, we
 prefer dependencies that are already packaged by Debian or Red Hat. This makes
 life much easier for our downstream package maintainers.
 
-Python dependencies must also be GPLv3 compatible.
+Python dependencies must also be license-compatible. GPLv3 or AGPLv3 are likely
+incompatible with the project's license, but LGPLv3 is compatible.
 
 New non-Python dependencies
 ===========================
@@ -55,3 +56,12 @@ of that platform.
 
 Packager maintainers, please ensure that the command line completion scripts in
 ``misc/`` are installed.
+
+Copyright and license
+=====================
+
+For contributions over 10 lines of code, please include your name to list of
+copyright holders for that file. The core program is licensed under MPL-2.0,
+test files and documentation under CC-BY-SA 4.0, and miscellaneous files under
+MIT. Please contribute code only that you wrote and you have the permission to
+contribute or license to us.

docs/docker.rst

@@ -163,8 +163,7 @@ complete. This may entail setting a long timeout; this interface is more
 useful for internal HTTP API calls.
 
 Unlike the rest of OCRmyPDF, this web service is licensed under the
-Affero GPLv3 (AGPLv3) since Ghostscript, a dependency of OCRmyPDF, is
+Affero GPLv3 (AGPLv3) since Ghostscript is also licensed in this way.
-also licensed in this way.
 
 In addition to the above, please read our
 :ref:`general remarks on using OCRmyPDF as a service <ocr-service>`.

docs/introduction.rst

@@ -186,6 +186,11 @@ Ghostscript also imposes some limitations:
 -  Ghostscript's PDF/A conversion removes any XMP metadata that is not
    one of the standard XMP metadata namespaces for PDFs. In particular,
    PRISM Metdata is removed.
+-  Ghostscript's PDF/A conversion seems to remove or deactivate
+   hyperlinks and other active content.
+
+You can use ``--output-type pdf`` to disable PDF/A conversion and produce
+a standard, non-archival PDF.
 
 Regarding OCRmyPDF itself:
 

docs/pdfsecurity.rst

@@ -64,7 +64,7 @@ malicious user could upload a chosen PDF. In particular, it is not
 necessarily secure against PDF malware or PDFs that cause denial of
 service. OCRmyPDF relies on Ghostscript, and therefore, if deployed
 online one should be prepared to comply with Ghostscript's Affero GPL
-license, OCRmyPDF's GPL license, and any other licenses.
+license, and any other licenses.
 
 Setting aside these concerns, a side effect of OCRmyPDF is it may
 incidentally sanitize PDFs that contain certain types of malware. It

docs/release_notes.rst

@@ -12,14 +12,34 @@ may be unreliable. Use the API to depend on precise behavior.
 The public API may be useful in scripts that launch OCRmyPDF processes or that
 wish to use some of its features for working with PDFs.
 
-Note that it is licensed under GPLv3, so scripts that
+v11.0.0
-``import ocrmypdf`` and are released publicly should probably also be
+=======
-licensed under GPLv3.
+
+-  Project license changed to Mozilla Public License 2.0. Some miscellaneous
+   code is now under MIT license and non-code content/media remains under
+   CC-BY-SA 4.0. License changed with approval of all people who were found
+   to have contributed to GPLv3 licensed sections of the project. (#600)
+-  Because the license changed, this is being treated as a major version number
+   change; however, there are no known breaking changes in functional behavior
+   or API compared to v10.x.
+
+v10.3.3
+=======
+
+-  Fixed a "KeyError: 'dpi'" error message when using ``--threshold`` on an image.
+   (#607)
+
+v10.3.2
+=======
+
+-  Fixed a case where we reported "no reason" for a file size increase, when we
+   could determine the reason.
+-  Enabled support for pdfminer.six 20200726.
 
 v10.3.1
 =======
 
--  Fixed a number of test suite failures with pdfminer.six older than veresion 20200420.
+-  Fixed a number of test suite failures with pdfminer.six older than veresion 20200402.
 -  Enabled support for pdfminer.six 20200720.
 
 v10.3.0
@@ -362,7 +382,7 @@ v9.0.0
 
 -  Added a high level API for applications that want to integrate OCRmyPDF.
    Special thanks to Martin Wind (@mawi1988) whose made significant contributions
-   to this effort. OCRmyPDF is GPLv3-licensed.
+   to this effort.
 -  Added progress bars for long-running steps. ■■■■■■■□□
 -  We now create linearized ("fast web view") PDFs by default. The new parameter
    ``--fast-web-view`` provides control over when this feature is applied.
@@ -989,8 +1009,8 @@ v6.1.0
 v6.0.0
 ======
 
--  The software license has been changed to GPLv3. Test resource files
+-  The software license has been changed to GPLv3 [it has since changed again].
-   and some individual sources may have other licenses.
+   Test resource files and some individual sources may have other licenses.
 -  OCRmyPDF now depends on
    `PyMuPDF <https://pymupdf.readthedocs.io/en/latest/installation/>`__.
    Including PyMuPDF is the primary reason for the change to GPLv3.

misc/batch.py

@@ -1,5 +1,23 @@
 #!/usr/bin/env python3
-# Original version by DeliciousPickle@github; modified
+# Copyright 2016 findingorder: https://github.com/findingorder
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 # This script must be edited to meet your needs.
 

misc/completion/ocrmypdf.bash

@@ -1,5 +1,26 @@
 # ocrmypdf completion                                     -*- shell-script -*-
 
+# Copyright 2019 Frank Pille
+# Copyright 2020 Alex Willner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 set -o errexit
 
 _ocrmypdf()

misc/completion/ocrmypdf.fish

@@ -1,3 +1,23 @@
+# Copyright 2020 James R. Barlow
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 complete -c ocrmypdf -x -n '__fish_is_first_arg' -l version
 complete -c ocrmypdf -x -n '__fish_is_first_arg' -s h -s "?" -l help
 

misc/example_plugin.py

@@ -1,17 +1,22 @@
 # © 2020 James R Barlow: https://github.com/jbarlow83
 #
-# This program is free software: you can redistribute it and/or modify
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# it under the terms of the GNU General Public License as published by
+# of this software and associated documentation files (the "Software"), to deal
-# the Free Software Foundation, either version 3 of the License, or
+# in the Software without restriction, including without limitation the rights
-# (at your option) any later version.
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# This program is distributed in the hope that it will be useful,
+# The above copyright notice and this permission notice shall be included in all
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# copies or substantial portions of the Software.
-# 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
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 import logging
 

misc/synology.py

@@ -1,5 +1,23 @@
 #!/bin/env python3
-# Contributed by github.com/Enantiomerie
+# Copyright 2017 github.com/Enantiomerie
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 # This script must be edited to meet your needs.
 

misc/watcher.py

@@ -1,18 +1,23 @@
 # Copyright (C) 2019 Ian Alexander: https://github.com/ianalexander
 # Copyright (C) 2020 James R Barlow: https://github.com/jbarlow83
 #
-# This program is free software: you can redistribute it and/or modify
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# it under the terms of the GNU General Public License as published by
+# of this software and associated documentation files (the "Software"), to deal
-# the Free Software Foundation, either version 3 of the License, or
+# in the Software without restriction, including without limitation the rights
-# (at your option) any later version.
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# This program is distributed in the hope that it will be useful,
+# The above copyright notice and this permission notice shall be included in all
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# copies or substantial portions of the Software.
-# 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
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 import json
 import logging

setup.py

@@ -2,20 +2,10 @@
 # -*- coding: utf-8 -*-
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function, unicode_literals
 
@@ -60,7 +50,7 @@ setup(
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: Science/Research",
         "Intended Audience :: System Administrators",
-        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows :: Windows 10",
         "Operating System :: POSIX",
@@ -83,7 +73,7 @@ setup(
         'cffi >= 1.9.1',  # must be a setup and install requirement
         'coloredlogs >= 14.0',  # strictly optional
         'img2pdf >= 0.3.0, < 0.4',  # pure Python, so track HEAD closely
-        'pdfminer.six >= 20191110, <= 20200720',
+        'pdfminer.six >= 20191110, <= 20200726',
         'pikepdf >= 1.14.0, < 2',
         'Pillow >= 7.0.0',
         'pluggy >= 0.13.0',

src/ocrmypdf/__init__.py

@@ -1,19 +1,8 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from pluggy import HookimplMarker as _HookimplMarker

src/ocrmypdf/__main__.py

@@ -1,20 +1,10 @@
 #!/usr/bin/env python3
 # © 2015-19 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import os

src/ocrmypdf/_concurrent.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import logging.handlers

src/ocrmypdf/_exec/__init__.py

@@ -1,18 +1,8 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Manage third party executables"""

src/ocrmypdf/_exec/ghostscript.py

@@ -1,19 +1,9 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Interface to Ghostscript executable"""
 

src/ocrmypdf/_exec/jbig2enc.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Interface to jbig2 executable"""
 

src/ocrmypdf/_exec/pngquant.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Interface to pngquant executable"""
 

src/ocrmypdf/_exec/tesseract.py

@@ -1,19 +1,9 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Interface to Tesseract executable"""
 

src/ocrmypdf/_exec/unpaper.py

@@ -1,19 +1,9 @@
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 # unpaper documentation:
 # https://github.com/Flameeyes/unpaper/blob/master/doc/basic-concepts.md

src/ocrmypdf/_graft.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from contextlib import suppress

src/ocrmypdf/_jobcontext.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import shutil

src/ocrmypdf/_logging.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import sys

src/ocrmypdf/_pipeline.py

@@ -1,19 +1,9 @@
 # © 2016 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import os
@@ -530,7 +520,9 @@ def create_ocr_image(image: Path, page_context: PageContext):
         if options.threshold:
             pix = leptonica.Pix.frompil(im)
             pix = pix.masked_threshold_on_background_norm()
-            im = pix.topil()
+            im_pix = pix.topil()
+            im_pix.info['dpi'] = im.info['dpi']
+            im = im_pix
 
         del draw
 

src/ocrmypdf/_plugin_manager.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import importlib

src/ocrmypdf/_sync.py

@@ -1,19 +1,9 @@
 # © 2016 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import logging.handlers

src/ocrmypdf/_validation.py

@@ -1,20 +1,9 @@
 #!/usr/bin/env python3
 # © 2015-17 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import locale
@@ -416,6 +405,10 @@ def report_output_file_size(options, input_file, output_file):
                     f"The optional dependency '{name}' was not found, so some image "
                     f"optimizations could not be attempted."
                 )
+    if options.output_type.startswith('pdfa'):
+        reasons.append("PDF/A conversion was enabled. (Try `--output-type pdf`.)")
+    if options.plugins:
+        reasons.append("Plugins were used.")
 
     if reasons:
         explanation = "Possible reasons for this include:\n" + '\n'.join(reasons) + "\n"

src/ocrmypdf/_version.py

@@ -1,19 +1,8 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import pkg_resources

src/ocrmypdf/api.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import os

src/ocrmypdf/builtin_plugins/__init__.py

@@ -1,16 +1,5 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.

src/ocrmypdf/builtin_plugins/ghostscript.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 

src/ocrmypdf/builtin_plugins/tesseract_ocr.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import os

src/ocrmypdf/cli.py

@@ -1,19 +1,9 @@
 # © 2015-19 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 

src/ocrmypdf/exceptions.py

@@ -1,19 +1,8 @@
 # © 2016 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from enum import IntEnum

src/ocrmypdf/helpers.py

@@ -1,19 +1,9 @@
 # © 2016 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import multiprocessing

src/ocrmypdf/leptonica.py

@@ -3,20 +3,10 @@
 #
 # © 2013-16: jbarlow83 from Github (https://github.com/jbarlow83)
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Python FFI wrapper for Leptonica library
 

src/ocrmypdf/lib/__init__.py

@@ -1,18 +1,8 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Bindings to external libraries"""

src/ocrmypdf/lib/compile_leptonica.py

@@ -1,20 +1,10 @@
 #!/usr/bin/env python3
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from pathlib import Path
 

src/ocrmypdf/optimize.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import sys

src/ocrmypdf/pdfa.py

@@ -1,19 +1,9 @@
-# © 2015 James R. Barlow: github.com/jbarlow83
+# © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Utilities for PDF/A production and confirmation with Ghostspcript.
@@ -21,8 +11,7 @@ Utilities for PDF/A production and confirmation with Ghostspcript.
 
 import base64
 from pathlib import Path
-from string import Template
+from typing import Dict, Iterator, Union
-from typing import Dict, Union
 
 import pikepdf
 import pkg_resources
@@ -32,29 +21,56 @@ ICC_PROFILE_RELPATH = 'data/sRGB.icc'
 SRGB_ICC_PROFILE = pkg_resources.resource_filename('ocrmypdf', ICC_PROFILE_RELPATH)
 
 
-# This is a template written in PostScript which is needed to create PDF/A
+def _postscript_objdef(
-# files, from the Ghostscript documentation. Lines beginning with % are
+    alias: str,
-# comments. Python substitution variables have a '$' prefix.
+    dictionary: Dict[str, str],
-pdfa_def_template = u"""%!
+    *,
-% Define an ICC profile :
+    stream_name: str = None,
-/ICCProfile $icc_profile
+    stream_data: bytes = None,
-def
+) -> Iterator[str]:
+    assert (stream_name is None) == (stream_data is None)
 
-[/_objdef {icc_PDFA} /type /stream /OBJ pdfmark
+    objtype = '/stream' if stream_name else '/dict'
-[{icc_PDFA} << /N 3 >> /PUT pdfmark
-[{icc_PDFA} ICCProfile /PUT pdfmark
 
-% Define the output intent dictionary :
+    if stream_name:
+        a85_data = base64.a85encode(stream_data, adobe=True).decode('ascii')
+        yield f'{stream_name} ' + a85_data
+        yield 'def'
 
-[/_objdef {OutputIntent_PDFA} /type /dict /OBJ pdfmark
+    if alias != '{Catalog}':  # Catalog needs no definition
-[{OutputIntent_PDFA} <<
+        yield f'[/_objdef {alias} /type {objtype} /OBJ pdfmark'
-  /Type /OutputIntent             % Must be so (the standard requires).
+
-  /S /GTS_PDFA1                   % Must be so (the standard requires).
+    yield f'[{alias} <<'
-  /DestOutputProfile {icc_PDFA}            % Must be so (see above).
+    for key, val in dictionary.items():
-  /OutputConditionIdentifier ($icc_identifier)
+        yield f'  {key} {val}'
->> /PUT pdfmark
+    yield '>> /PUT pdfmark'
-[{Catalog} <</OutputIntents [ {OutputIntent_PDFA} ]>> /PUT pdfmark
+
-"""
+    if stream_name:
+        yield f'[{alias} {stream_name[1:]} /PUT pdfmark'
+
+
+def _make_postscript(icc_name: str, icc_data: bytes, colors: int) -> Iterator[str]:
+    yield '%!'
+    yield from _postscript_objdef(
+        '{icc_PDFA}',  # Not an f-string
+        {'/N': str(colors)},
+        stream_name='/ICCProfile',
+        stream_data=icc_data,
+    )
+    yield ''
+    yield from _postscript_objdef(
+        '{OutputIntent_PDFA}',
+        {
+            '/Type': '/OutputIntent',
+            '/S': '/GTS_PDFA1',
+            '/DestOutputProfile': '{icc_PDFA}',
+            '/OutputConditionIdentifier': f'({icc_name})',  # Only f-string
+        },
+    )
+    yield ''
+    yield from _postscript_objdef(
+        '{Catalog}', {'/OutputIntents': '[ {OutputIntent_PDFA} ]'}
+    )
 
 
 def generate_pdfa_ps(target_filename: Path, icc: str = 'sRGB'):
@@ -85,13 +101,8 @@ def generate_pdfa_ps(target_filename: Path, icc: str = 'sRGB'):
     else:
         raise NotImplementedError("Only supporting sRGB")
 
-    # Read the ICC profile, encode as ASCII85 and convert to a string which we
-    # will insert in the .ps file
     bytes_icc_profile = Path(icc_profile).read_bytes()
-    icc_profile = base64.a85encode(bytes_icc_profile, adobe=True).decode('ascii')
+    ps = '\n'.join(_make_postscript(icc, bytes_icc_profile, 3))
-
-    t = Template(pdfa_def_template)
-    ps = t.substitute(icc_profile=icc_profile, icc_identifier=icc)
 
     # We should have encoded everything to pure ASCII by this point, and
     # to be safe, only allow ASCII in PostScript

src/ocrmypdf/pdfinfo/__init__.py

@@ -1,19 +1,9 @@
 #!/usr/bin/env python3
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from ocrmypdf.pdfinfo.info import Colorspace, Encoding, PdfInfo

src/ocrmypdf/pdfinfo/info.py

@@ -1,20 +1,10 @@
 #!/usr/bin/env python3
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import re

src/ocrmypdf/pdfinfo/layout.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from math import copysign

src/ocrmypdf/pluginspec.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABC, abstractmethod, abstractstaticmethod
 from argparse import ArgumentParser, Namespace

src/ocrmypdf/quality.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Utilities to measure OCR quality"""
 

src/ocrmypdf/subprocess.py

@@ -1,19 +1,9 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 """Wrappers to manage subprocess calls"""
 

tests/conftest.py

@@ -1,19 +1,9 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import platform

tests/spoof/gs.py

@@ -1,40 +0,0 @@
-# © 2019 James R. Barlow: github.com/jbarlow83
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-"""Find Ghostscript executable"""
-
-
-import os
-import shutil
-
-
-def real_ghostscript(argv):
-    if os.name != 'nt':
-        gs = shutil.which('gs')
-        gs_args = [gs] + argv[1:]
-        os.execv(gs_args[0], gs_args)
-    else:
-        gs = shutil.which('gswin64c')
-        if not gs:
-            gs = shutil.which('gswin32c')
-        os.execv(gs, argv[1:])
-
-    return  # Not reachable

tests/test_acroform.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 

tests/test_api.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from io import BytesIO, StringIO

tests/test_check_pdf.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
 

tests/test_completion.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from subprocess import PIPE, run
 

tests/test_ghostscript.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from decimal import Decimal

tests/test_graft.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from unittest.mock import patch
 

tests/test_helpers.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import multiprocessing
@@ -22,7 +12,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-import ocrmypdf.helpers as helpers
+from ocrmypdf import helpers as helpers
 from ocrmypdf.subprocess import shim_paths_with_program_files
 
 

tests/test_hocrtransform.py

@@ -1,19 +1,9 @@
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 from io import StringIO

tests/test_image_input.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from unittest.mock import patch
 

tests/test_lept.py

@@ -1,19 +1,8 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from os import fspath

tests/test_main.py

@@ -1,19 +1,9 @@
 # © 2015-19 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import shutil
@@ -877,3 +867,17 @@ def test_image_dpi_not_image(caplog, resources, outpdf):
         'tests/plugins/tesseract_noop.py',
     )
     assert '--image-dpi is being ignored' in caplog.text
+
+
+def test_image_dpi_threshold(resources, outpdf):
+    check_ocrmypdf(
+        resources / 'typewriter.png',
+        outpdf,
+        '--threshold',
+        '--image-dpi=170',
+        '--output-type=pdf',
+        '--optimize=0',
+        '--plugin',
+        'tests/plugins/tesseract_noop.py',
+    )
+    assert outpdf.exists()

tests/test_metadata.py

@@ -1,19 +1,8 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import datetime

tests/test_optimize.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from os import fspath
 from pathlib import Path

tests/test_page_numbers.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
 

tests/test_pdfinfo.py

@@ -1,19 +1,9 @@
 # © 2015 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import pickle
 from math import isclose

tests/test_preprocessing.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from math import isclose
 

tests/test_quality.py

@@ -1,23 +1,13 @@
 # © 2020 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
 
-import ocrmypdf.quality as qual
+from ocrmypdf import quality as qual
 
 
 def test_quality_measurement():

tests/test_rotation.py

@@ -1,19 +1,9 @@
 # © 2018 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from io import BytesIO
 from os import fspath

tests/test_stdio.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys

tests/test_tesseract.py

@@ -1,19 +1,9 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 import os

tests/test_unpaper.py

@@ -1,19 +1,9 @@
 # © 2015-17 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from os import fspath
 from unittest.mock import patch

tests/test_userunit.py

@@ -1,19 +1,9 @@
 # © 2017 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 from math import isclose
 

tests/test_validation.py

@@ -1,19 +1,9 @@
 # © 2019 James R. Barlow: github.com/jbarlow83
 #
-# This file is part of OCRmyPDF.
+# This Source Code Form is subject to the terms of the Mozilla Public
-#
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# OCRmyPDF is free software: you can redistribute it and/or modify
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# it under the terms of the GNU General Public License as published by
+
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# OCRmyPDF 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 OCRmyPDF.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from unittest.mock import patch
@@ -21,7 +11,7 @@ from unittest.mock import patch
 import pikepdf
 import pytest
 
-import ocrmypdf._validation as vd
+from ocrmypdf import _validation as vd
 from ocrmypdf._plugin_manager import get_plugin_manager
 from ocrmypdf.api import create_options
 from ocrmypdf.cli import get_parser
@@ -141,7 +131,7 @@ def test_report_file_size(tmp_path, caplog):
     pdf = pikepdf.new()
     pdf.save(in_)
     pdf.save(out)
-    opts = make_opts()
+    opts = make_opts(output_type='pdf')
     vd.report_output_file_size(opts, in_, out)
     assert caplog.text == ''
     caplog.clear()
@@ -166,7 +156,7 @@ def test_report_file_size(tmp_path, caplog):
         assert 'optional dependency' in caplog.text
     caplog.clear()
 
-    opts = make_opts(in_, out, optimize=0)
+    opts = make_opts(in_, out, optimize=0, output_type='pdf')
     vd.report_output_file_size(opts, in_, out)
     assert 'disabled' in caplog.text
     caplog.clear()