commit
aab42f3086
15 changed files with 2420 additions and 0 deletions
@ -0,0 +1,2 @@
|
||||
github: makeworld-the-better-one |
||||
ko_fi: makeworld |
||||
@ -0,0 +1,26 @@
|
||||
name: goreleaser |
||||
|
||||
on: |
||||
push: |
||||
tags: |
||||
- v* |
||||
|
||||
jobs: |
||||
goreleaser: |
||||
runs-on: ubuntu-latest |
||||
steps: |
||||
- name: Checkout |
||||
uses: actions/checkout@v2 |
||||
with: |
||||
fetch-depth: 0 |
||||
- name: Set up Go |
||||
uses: actions/setup-go@v2 |
||||
with: |
||||
go-version: 1.16 |
||||
- name: Run GoReleaser |
||||
uses: goreleaser/goreleaser-action@v2 |
||||
with: |
||||
version: 0.x |
||||
args: release --rm-dist |
||||
env: |
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
||||
@ -0,0 +1,34 @@
|
||||
name: test |
||||
|
||||
on: |
||||
push: |
||||
paths-ignore: |
||||
- "**.md" |
||||
- "LICENSE" |
||||
pull_request: |
||||
paths-ignore: |
||||
- "**.md" |
||||
- "LICENSE" |
||||
|
||||
jobs: |
||||
test: |
||||
runs-on: ubuntu-latest |
||||
strategy: |
||||
fail-fast: false |
||||
matrix: |
||||
go-version: ["1.14", "1.15", "1.16"] |
||||
steps: |
||||
- name: Install Go |
||||
uses: actions/setup-go@v2 |
||||
with: |
||||
go-version: ${{ matrix.go-version }} |
||||
- name: Checkout code |
||||
uses: actions/checkout@v2 |
||||
- uses: actions/cache@v2 |
||||
with: |
||||
path: ~/go/pkg/mod |
||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} |
||||
restore-keys: | |
||||
${{ runner.os }}-go- |
||||
- name: Test |
||||
run: make |
||||
@ -0,0 +1,108 @@
|
||||
NOTES.md |
||||
*.png |
||||
*.gif |
||||
didder |
||||
!david_dithered.png |
||||
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/go,code,linux,windows,macos |
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=go,code,linux,windows,macos |
||||
|
||||
### Code ### |
||||
.vscode/* |
||||
!.vscode/tasks.json |
||||
!.vscode/launch.json |
||||
*.code-workspace |
||||
|
||||
### Go ### |
||||
# Binaries for programs and plugins |
||||
*.exe |
||||
*.exe~ |
||||
*.dll |
||||
*.so |
||||
*.dylib |
||||
|
||||
# Test binary, built with `go test -c` |
||||
*.test |
||||
|
||||
# Output of the go coverage tool, specifically when used with LiteIDE |
||||
*.out |
||||
|
||||
# Dependency directories (remove the comment below to include it) |
||||
# vendor/ |
||||
|
||||
### Go Patch ### |
||||
/vendor/ |
||||
/Godeps/ |
||||
|
||||
### Linux ### |
||||
*~ |
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file |
||||
.fuse_hidden* |
||||
|
||||
# KDE directory preferences |
||||
.directory |
||||
|
||||
# Linux trash folder which might appear on any partition or disk |
||||
.Trash-* |
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed |
||||
.nfs* |
||||
|
||||
### macOS ### |
||||
# General |
||||
.DS_Store |
||||
.AppleDouble |
||||
.LSOverride |
||||
|
||||
# Icon must end with two \r |
||||
Icon |
||||
|
||||
|
||||
# Thumbnails |
||||
._* |
||||
|
||||
# Files that might appear in the root of a volume |
||||
.DocumentRevisions-V100 |
||||
.fseventsd |
||||
.Spotlight-V100 |
||||
.TemporaryItems |
||||
.Trashes |
||||
.VolumeIcon.icns |
||||
.com.apple.timemachine.donotpresent |
||||
|
||||
# Directories potentially created on remote AFP share |
||||
.AppleDB |
||||
.AppleDesktop |
||||
Network Trash Folder |
||||
Temporary Items |
||||
.apdisk |
||||
|
||||
### Windows ### |
||||
# Windows thumbnail cache files |
||||
Thumbs.db |
||||
Thumbs.db:encryptable |
||||
ehthumbs.db |
||||
ehthumbs_vista.db |
||||
|
||||
# Dump file |
||||
*.stackdump |
||||
|
||||
# Folder config file |
||||
[Dd]esktop.ini |
||||
|
||||
# Recycle Bin used on file shares |
||||
$RECYCLE.BIN/ |
||||
|
||||
# Windows Installer files |
||||
*.cab |
||||
*.msi |
||||
*.msix |
||||
*.msm |
||||
*.msp |
||||
|
||||
# Windows shortcuts |
||||
*.lnk |
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/go,code,linux,windows,macos |
||||
@ -0,0 +1,57 @@
|
||||
project_name: didder |
||||
|
||||
env: |
||||
- GO111MODULE=on |
||||
|
||||
before: |
||||
hooks: |
||||
- go mod download |
||||
|
||||
builds: |
||||
- env: |
||||
- CGO_ENABLED=0 |
||||
|
||||
goos: |
||||
- linux |
||||
- windows |
||||
- darwin |
||||
- freebsd |
||||
- netbsd |
||||
- openbsd |
||||
goarch: |
||||
- 386 |
||||
- amd64 |
||||
- arm64 |
||||
- arm |
||||
goarm: |
||||
- 6 |
||||
- 7 |
||||
|
||||
ignore: |
||||
- goos: darwin |
||||
goarch: 386 |
||||
- goos: freebsd |
||||
goarch: arm |
||||
- goos: freebsd |
||||
goarch: arm64 |
||||
- goos: netbsd |
||||
goarch: arm |
||||
- goos: netbsd |
||||
goarch: arm64 |
||||
- goos: openbsd |
||||
goarch: arm |
||||
- goos: openbsd |
||||
goarch: arm64 |
||||
|
||||
archives: |
||||
- format: binary |
||||
replacements: |
||||
darwin: macOS |
||||
386: 32-bit |
||||
amd64: 64-bit |
||||
|
||||
milestones: |
||||
- close: true |
||||
|
||||
changelog: |
||||
skip: true |
||||
@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE |
||||
Version 3, 29 June 2007 |
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> |
||||
Everyone is permitted to copy and distribute verbatim copies |
||||
of this license document, but changing it is not allowed. |
||||
|
||||
Preamble |
||||
|
||||
The GNU General Public License is a free, copyleft license for |
||||
software and other kinds of works. |
||||
|
||||
The licenses for most software and other practical works are designed |
||||
to take away your freedom to share and change the works. By contrast, |
||||
the GNU General Public License is intended to guarantee your freedom to |
||||
share and change all versions of a program--to make sure it remains free |
||||
software for all its users. We, the Free Software Foundation, use the |
||||
GNU General Public License for most of our software; it applies also to |
||||
any other work released this way by its authors. You can apply it to |
||||
your programs, too. |
||||
|
||||
When we speak of free software, we are referring to freedom, not |
||||
price. Our General Public Licenses are designed to make sure that you |
||||
have the freedom to distribute copies of free software (and charge for |
||||
them if you wish), that you receive source code or can get it if you |
||||
want it, that you can change the software or use pieces of it in new |
||||
free programs, and that you know you can do these things. |
||||
|
||||
To protect your rights, we need to prevent others from denying you |
||||
these rights or asking you to surrender the rights. Therefore, you have |
||||
certain responsibilities if you distribute copies of the software, or if |
||||
you modify it: responsibilities to respect the freedom of others. |
||||
|
||||
For example, if you distribute copies of such a program, whether |
||||
gratis or for a fee, you must pass on to the recipients the same |
||||
freedoms that you received. You must make sure that they, too, receive |
||||
or can get the source code. And you must show them these terms so they |
||||
know their rights. |
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps: |
||||
(1) assert copyright on the software, and (2) offer you this License |
||||
giving you legal permission to copy, distribute and/or modify it. |
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains |
||||
that there is no warranty for this free software. For both users' and |
||||
authors' sake, the GPL requires that modified versions be marked as |
||||
changed, so that their problems will not be attributed erroneously to |
||||
authors of previous versions. |
||||
|
||||
Some devices are designed to deny users access to install or run |
||||
modified versions of the software inside them, although the manufacturer |
||||
can do so. This is fundamentally incompatible with the aim of |
||||
protecting users' freedom to change the software. The systematic |
||||
pattern of such abuse occurs in the area of products for individuals to |
||||
use, which is precisely where it is most unacceptable. Therefore, we |
||||
have designed this version of the GPL to prohibit the practice for those |
||||
products. If such problems arise substantially in other domains, we |
||||
stand ready to extend this provision to those domains in future versions |
||||
of the GPL, as needed to protect the freedom of users. |
||||
|
||||
Finally, every program is threatened constantly by software patents. |
||||
States should not allow patents to restrict development and use of |
||||
software on general-purpose computers, but in those that do, we wish to |
||||
avoid the special danger that patents applied to a free program could |
||||
make it effectively proprietary. To prevent this, the GPL assures that |
||||
patents cannot be used to render the program non-free. |
||||
|
||||
The precise terms and conditions for copying, distribution and |
||||
modification follow. |
||||
|
||||
TERMS AND CONDITIONS |
||||
|
||||
0. Definitions. |
||||
|
||||
"This License" refers to version 3 of the GNU General Public License. |
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of |
||||
works, such as semiconductor masks. |
||||
|
||||
"The Program" refers to any copyrightable work licensed under this |
||||
License. Each licensee is addressed as "you". "Licensees" and |
||||
"recipients" may be individuals or organizations. |
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work |
||||
in a fashion requiring copyright permission, other than the making of an |
||||
exact copy. The resulting work is called a "modified version" of the |
||||
earlier work or a work "based on" the earlier work. |
||||
|
||||
A "covered work" means either the unmodified Program or a work based |
||||
on the Program. |
||||
|
||||
To "propagate" a work means to do anything with it that, without |
||||
permission, would make you directly or secondarily liable for |
||||
infringement under applicable copyright law, except executing it on a |
||||
computer or modifying a private copy. Propagation includes copying, |
||||
distribution (with or without modification), making available to the |
||||
public, and in some countries other activities as well. |
||||
|
||||
To "convey" a work means any kind of propagation that enables other |
||||
parties to make or receive copies. Mere interaction with a user through |
||||
a computer network, with no transfer of a copy, is not conveying. |
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices" |
||||
to the extent that it includes a convenient and prominently visible |
||||
feature that (1) displays an appropriate copyright notice, and (2) |
||||
tells the user that there is no warranty for the work (except to the |
||||
extent that warranties are provided), that licensees may convey the |
||||
work under this License, and how to view a copy of this License. If |
||||
the interface presents a list of user commands or options, such as a |
||||
menu, a prominent item in the list meets this criterion. |
||||
|
||||
1. Source Code. |
||||
|
||||
The "source code" for a work means the preferred form of the work |
||||
for making modifications to it. "Object code" means any non-source |
||||
form of a work. |
||||
|
||||
A "Standard Interface" means an interface that either is an official |
||||
standard defined by a recognized standards body, or, in the case of |
||||
interfaces specified for a particular programming language, one that |
||||
is widely used among developers working in that language. |
||||
|
||||
The "System Libraries" of an executable work include anything, other |
||||
than the work as a whole, that (a) is included in the normal form of |
||||
packaging a Major Component, but which is not part of that Major |
||||
Component, and (b) serves only to enable use of the work with that |
||||
Major Component, or to implement a Standard Interface for which an |
||||
implementation is available to the public in source code form. A |
||||
"Major Component", in this context, means a major essential component |
||||
(kernel, window system, and so on) of the specific operating system |
||||
(if any) on which the executable work runs, or a compiler used to |
||||
produce the work, or an object code interpreter used to run it. |
||||
|
||||
The "Corresponding Source" for a work in object code form means all |
||||
the source code needed to generate, install, and (for an executable |
||||
work) run the object code and to modify the work, including scripts to |
||||
control those activities. However, it does not include the work's |
||||
System Libraries, or general-purpose tools or generally available free |
||||
programs which are used unmodified in performing those activities but |
||||
which are not part of the work. For example, Corresponding Source |
||||
includes interface definition files associated with source files for |
||||
the work, and the source code for shared libraries and dynamically |
||||
linked subprograms that the work is specifically designed to require, |
||||
such as by intimate data communication or control flow between those |
||||
subprograms and other parts of the work. |
||||
|
||||
The Corresponding Source need not include anything that users |
||||
can regenerate automatically from other parts of the Corresponding |
||||
Source. |
||||
|
||||
The Corresponding Source for a work in source code form is that |
||||
same work. |
||||
|
||||
2. Basic Permissions. |
||||
|
||||
All rights granted under this License are granted for the term of |
||||
copyright on the Program, and are irrevocable provided the stated |
||||
conditions are met. This License explicitly affirms your unlimited |
||||
permission to run the unmodified Program. The output from running a |
||||
covered work is covered by this License only if the output, given its |
||||
content, constitutes a covered work. This License acknowledges your |
||||
rights of fair use or other equivalent, as provided by copyright law. |
||||
|
||||
You may make, run and propagate covered works that you do not |
||||
convey, without conditions so long as your license otherwise remains |
||||
in force. You may convey covered works to others for the sole purpose |
||||
of having them make modifications exclusively for you, or provide you |
||||
with facilities for running those works, provided that you comply with |
||||
the terms of this License in conveying all material for which you do |
||||
not control copyright. Those thus making or running the covered works |
||||
for you must do so exclusively on your behalf, under your direction |
||||
and control, on terms that prohibit them from making any copies of |
||||
your copyrighted material outside their relationship with you. |
||||
|
||||
Conveying under any other circumstances is permitted solely under |
||||
the conditions stated below. Sublicensing is not allowed; section 10 |
||||
makes it unnecessary. |
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law. |
||||
|
||||
No covered work shall be deemed part of an effective technological |
||||
measure under any applicable law fulfilling obligations under article |
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or |
||||
similar laws prohibiting or restricting circumvention of such |
||||
measures. |
||||
|
||||
When you convey a covered work, you waive any legal power to forbid |
||||
circumvention of technological measures to the extent such circumvention |
||||
is effected by exercising rights under this License with respect to |
||||
the covered work, and you disclaim any intention to limit operation or |
||||
modification of the work as a means of enforcing, against the work's |
||||
users, your or third parties' legal rights to forbid circumvention of |
||||
technological measures. |
||||
|
||||
4. Conveying Verbatim Copies. |
||||
|
||||
You may convey verbatim copies of the Program's source code as you |
||||
receive it, in any medium, provided that you conspicuously and |
||||
appropriately publish on each copy an appropriate copyright notice; |
||||
keep intact all notices stating that this License and any |
||||
non-permissive terms added in accord with section 7 apply to the code; |
||||
keep intact all notices of the absence of any warranty; and give all |
||||
recipients a copy of this License along with the Program. |
||||
|
||||
You may charge any price or no price for each copy that you convey, |
||||
and you may offer support or warranty protection for a fee. |
||||
|
||||
5. Conveying Modified Source Versions. |
||||
|
||||
You may convey a work based on the Program, or the modifications to |
||||
produce it from the Program, in the form of source code under the |
||||
terms of section 4, provided that you also meet all of these conditions: |
||||
|
||||
a) The work must carry prominent notices stating that you modified |
||||
it, and giving a relevant date. |
||||
|
||||
b) The work must carry prominent notices stating that it is |
||||
released under this License and any conditions added under section |
||||
7. This requirement modifies the requirement in section 4 to |
||||
"keep intact all notices". |
||||
|
||||
c) You must license the entire work, as a whole, under this |
||||
License to anyone who comes into possession of a copy. This |
||||
License will therefore apply, along with any applicable section 7 |
||||
additional terms, to the whole of the work, and all its parts, |
||||
regardless of how they are packaged. This License gives no |
||||
permission to license the work in any other way, but it does not |
||||
invalidate such permission if you have separately received it. |
||||
|
||||
d) If the work has interactive user interfaces, each must display |
||||
Appropriate Legal Notices; however, if the Program has interactive |
||||
interfaces that do not display Appropriate Legal Notices, your |
||||
work need not make them do so. |
||||
|
||||
A compilation of a covered work with other separate and independent |
||||
works, which are not by their nature extensions of the covered work, |
||||
and which are not combined with it such as to form a larger program, |
||||
in or on a volume of a storage or distribution medium, is called an |
||||
"aggregate" if the compilation and its resulting copyright are not |
||||
used to limit the access or legal rights of the compilation's users |
||||
beyond what the individual works permit. Inclusion of a covered work |
||||
in an aggregate does not cause this License to apply to the other |
||||
parts of the aggregate. |
||||
|
||||
6. Conveying Non-Source Forms. |
||||
|
||||
You may convey a covered work in object code form under the terms |
||||
of sections 4 and 5, provided that you also convey the |
||||
machine-readable Corresponding Source under the terms of this License, |
||||
in one of these ways: |
||||
|
||||
a) Convey the object code in, or embodied in, a physical product |
||||
(including a physical distribution medium), accompanied by the |
||||
Corresponding Source fixed on a durable physical medium |
||||
customarily used for software interchange. |
||||
|
||||
b) Convey the object code in, or embodied in, a physical product |
||||
(including a physical distribution medium), accompanied by a |
||||
written offer, valid for at least three years and valid for as |
||||
long as you offer spare parts or customer support for that product |
||||
model, to give anyone who possesses the object code either (1) a |
||||
copy of the Corresponding Source for all the software in the |
||||
product that is covered by this License, on a durable physical |
||||
medium customarily used for software interchange, for a price no |
||||
more than your reasonable cost of physically performing this |
||||
conveying of source, or (2) access to copy the |
||||
Corresponding Source from a network server at no charge. |
||||
|
||||
c) Convey individual copies of the object code with a copy of the |
||||
written offer to provide the Corresponding Source. This |
||||
alternative is allowed only occasionally and noncommercially, and |
||||
only if you received the object code with such an offer, in accord |
||||
with subsection 6b. |
||||
|
||||
d) Convey the object code by offering access from a designated |
||||
place (gratis or for a charge), and offer equivalent access to the |
||||
Corresponding Source in the same way through the same place at no |
||||
further charge. You need not require recipients to copy the |
||||
Corresponding Source along with the object code. If the place to |
||||
copy the object code is a network server, the Corresponding Source |
||||
may be on a different server (operated by you or a third party) |
||||
that supports equivalent copying facilities, provided you maintain |
||||
clear directions next to the object code saying where to find the |
||||
Corresponding Source. Regardless of what server hosts the |
||||
Corresponding Source, you remain obligated to ensure that it is |
||||
available for as long as needed to satisfy these requirements. |
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided |
||||
you inform other peers where the object code and Corresponding |
||||
Source of the work are being offered to the general public at no |
||||
charge under subsection 6d. |
||||
|
||||
A separable portion of the object code, whose source code is excluded |
||||
from the Corresponding Source as a System Library, need not be |
||||
included in conveying the object code work. |
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any |
||||
tangible personal property which is normally used for personal, family, |
||||
or household purposes, or (2) anything designed or sold for incorporation |
||||
into a dwelling. In determining whether a product is a consumer product, |
||||
doubtful cases shall be resolved in favor of coverage. For a particular |
||||
product received by a particular user, "normally used" refers to a |
||||
typical or common use of that class of product, regardless of the status |
||||
of the particular user or of the way in which the particular user |
||||
actually uses, or expects or is expected to use, the product. A product |
||||
is a consumer product regardless of whether the product has substantial |
||||
commercial, industrial or non-consumer uses, unless such uses represent |
||||
the only significant mode of use of the product. |
||||
|
||||
"Installation Information" for a User Product means any methods, |
||||
procedures, authorization keys, or other information required to install |
||||
and execute modified versions of a covered work in that User Product from |
||||
a modified version of its Corresponding Source. The information must |
||||
suffice to ensure that the continued functioning of the modified object |
||||
code is in no case prevented or interfered with solely because |
||||
modification has been made. |
||||
|
||||
If you convey an object code work under this section in, or with, or |
||||
specifically for use in, a User Product, and the conveying occurs as |
||||
part of a transaction in which the right of possession and use of the |
||||
User Product is transferred to the recipient in perpetuity or for a |
||||
fixed term (regardless of how the transaction is characterized), the |
||||
Corresponding Source conveyed under this section must be accompanied |
||||
by the Installation Information. But this requirement does not apply |
||||
if neither you nor any third party retains the ability to install |
||||
modified object code on the User Product (for example, the work has |
||||
been installed in ROM). |
||||
|
||||
The requirement to provide Installation Information does not include a |
||||
requirement to continue to provide support service, warranty, or updates |
||||
for a work that has been modified or installed by the recipient, or for |
||||
the User Product in which it has been modified or installed. Access to a |
||||
network may be denied when the modification itself materially and |
||||
adversely affects the operation of the network or violates the rules and |
||||
protocols for communication across the network. |
||||
|
||||
Corresponding Source conveyed, and Installation Information provided, |
||||
in accord with this section must be in a format that is publicly |
||||
documented (and with an implementation available to the public in |
||||
source code form), and must require no special password or key for |
||||
unpacking, reading or copying. |
||||
|
||||
7. Additional Terms. |
||||
|
||||
"Additional permissions" are terms that supplement the terms of this |
||||
License by making exceptions from one or more of its conditions. |
||||
Additional permissions that are applicable to the entire Program shall |
||||
be treated as though they were included in this License, to the extent |
||||
that they are valid under applicable law. If additional permissions |
||||
apply only to part of the Program, that part may be used separately |
||||
under those permissions, but the entire Program remains governed by |
||||
this License without regard to the additional permissions. |
||||
|
||||
When you convey a copy of a covered work, you may at your option |
||||
remove any additional permissions from that copy, or from any part of |
||||
it. (Additional permissions may be written to require their own |
||||
removal in certain cases when you modify the work.) You may place |
||||
additional permissions on material, added by you to a covered work, |
||||
for which you have or can give appropriate copyright permission. |
||||
|
||||
Notwithstanding any other provision of this License, for material you |
||||
add to a covered work, you may (if authorized by the copyright holders of |
||||
that material) supplement the terms of this License with terms: |
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the |
||||
terms of sections 15 and 16 of this License; or |
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or |
||||
author attributions in that material or in the Appropriate Legal |
||||
Notices displayed by works containing it; or |
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or |
||||
requiring that modified versions of such material be marked in |
||||
reasonable ways as different from the original version; or |
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or |
||||
authors of the material; or |
||||
|
||||
e) Declining to grant rights under trademark law for use of some |
||||
trade names, trademarks, or service marks; or |
||||
|
||||
f) Requiring indemnification of licensors and authors of that |
||||
material by anyone who conveys the material (or modified versions of |
||||
it) with contractual assumptions of liability to the recipient, for |
||||
any liability that these contractual assumptions directly impose on |
||||
those licensors and authors. |
||||
|
||||
All other non-permissive additional terms are considered "further |
||||
restrictions" within the meaning of section 10. If the Program as you |
||||
received it, or any part of it, contains a notice stating that it is |
||||
governed by this License along with a term that is a further |
||||
restriction, you may remove that term. If a license document contains |
||||
a further restriction but permits relicensing or conveying under this |
||||
License, you may add to a covered work material governed by the terms |
||||
of that license document, provided that the further restriction does |
||||
not survive such relicensing or conveying. |
||||
|
||||
If you add terms to a covered work in accord with this section, you |
||||
must place, in the relevant source files, a statement of the |
||||
additional terms that apply to those files, or a notice indicating |
||||
where to find the applicable terms. |
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the |
||||
form of a separately written license, or stated as exceptions; |
||||
the above requirements apply either way. |
||||
|
||||
8. Termination. |
||||
|
||||
You may not propagate or modify a covered work except as expressly |
||||
provided under this License. Any attempt otherwise to propagate or |
||||
modify it is void, and will automatically terminate your rights under |
||||
this License (including any patent licenses granted under the third |
||||
paragraph of section 11). |
||||
|
||||
However, if you cease all violation of this License, then your |
||||
license from a particular copyright holder is reinstated (a) |
||||
provisionally, unless and until the copyright holder explicitly and |
||||
finally terminates your license, and (b) permanently, if the copyright |
||||
holder fails to notify you of the violation by some reasonable means |
||||
prior to 60 days after the cessation. |
||||
|
||||
Moreover, your license from a particular copyright holder is |
||||
reinstated permanently if the copyright holder notifies you of the |
||||
violation by some reasonable means, this is the first time you have |
||||
received notice of violation of this License (for any work) from that |
||||
copyright holder, and you cure the violation prior to 30 days after |
||||
your receipt of the notice. |
||||
|
||||
Termination of your rights under this section does not terminate the |
||||
licenses of parties who have received copies or rights from you under |
||||
this License. If your rights have been terminated and not permanently |
||||
reinstated, you do not qualify to receive new licenses for the same |
||||
material under section 10. |
||||
|
||||
9. Acceptance Not Required for Having Copies. |
||||
|
||||
You are not required to accept this License in order to receive or |
||||
run a copy of the Program. Ancillary propagation of a covered work |
||||
occurring solely as a consequence of using peer-to-peer transmission |
||||
to receive a copy likewise does not require acceptance. However, |
||||
nothing other than this License grants you permission to propagate or |
||||
modify any covered work. These actions infringe copyright if you do |
||||
not accept this License. Therefore, by modifying or propagating a |
||||
covered work, you indicate your acceptance of this License to do so. |
||||
|
||||
10. Automatic Licensing of Downstream Recipients. |
||||
|
||||
Each time you convey a covered work, the recipient automatically |
||||
receives a license from the original licensors, to run, modify and |
||||
propagate that work, subject to this License. You are not responsible |
||||
for enforcing compliance by third parties with this License. |
||||
|
||||
An "entity transaction" is a transaction transferring control of an |
||||
organization, or substantially all assets of one, or subdividing an |
||||
organization, or merging organizations. If propagation of a covered |
||||
work results from an entity transaction, each party to that |
||||
transaction who receives a copy of the work also receives whatever |
||||
licenses to the work the party's predecessor in interest had or could |
||||
give under the previous paragraph, plus a right to possession of the |
||||
Corresponding Source of the work from the predecessor in interest, if |
||||
the predecessor has it or can get it with reasonable efforts. |
||||
|
||||
You may not impose any further restrictions on the exercise of the |
||||
rights granted or affirmed under this License. For example, you may |
||||
not impose a license fee, royalty, or other charge for exercise of |
||||
rights granted under this License, and you may not initiate litigation |
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that |
||||
any patent claim is infringed by making, using, selling, offering for |
||||
sale, or importing the Program or any portion of it. |
||||
|
||||
11. Patents. |
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this |
||||
License of the Program or a work on which the Program is based. The |
||||
work thus licensed is called the contributor's "contributor version". |
||||
|
||||
A contributor's "essential patent claims" are all patent claims |
||||
owned or controlled by the contributor, whether already acquired or |
||||
hereafter acquired, that would be infringed by some manner, permitted |
||||
by this License, of making, using, or selling its contributor version, |
||||
but do not include claims that would be infringed only as a |
||||
consequence of further modification of the contributor version. For |
||||
purposes of this definition, "control" includes the right to grant |
||||
patent sublicenses in a manner consistent with the requirements of |
||||
this License. |
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free |
||||
patent license under the contributor's essential patent claims, to |
||||
make, use, sell, offer for sale, import and otherwise run, modify and |
||||
propagate the contents of its contributor version. |
||||
|
||||
In the following three paragraphs, a "patent license" is any express |
||||
agreement or commitment, however denominated, not to enforce a patent |
||||
(such as an express permission to practice a patent or covenant not to |
||||
sue for patent infringement). To "grant" such a patent license to a |
||||
party means to make such an agreement or commitment not to enforce a |
||||
patent against the party. |
||||
|
||||
If you convey a covered work, knowingly relying on a patent license, |
||||
and the Corresponding Source of the work is not available for anyone |
||||
to copy, free of charge and under the terms of this License, through a |
||||
publicly available network server or other readily accessible means, |
||||
then you must either (1) cause the Corresponding Source to be so |
||||
available, or (2) arrange to deprive yourself of the benefit of the |
||||
patent license for this particular work, or (3) arrange, in a manner |
||||
consistent with the requirements of this License, to extend the patent |
||||
license to downstream recipients. "Knowingly relying" means you have |
||||
actual knowledge that, but for the patent license, your conveying the |
||||
covered work in a country, or your recipient's use of the covered work |
||||
in a country, would infringe one or more identifiable patents in that |
||||
country that you have reason to believe are valid. |
||||
|
||||
If, pursuant to or in connection with a single transaction or |
||||
arrangement, you convey, or propagate by procuring conveyance of, a |
||||
covered work, and grant a patent license to some of the parties |
||||
receiving the covered work authorizing them to use, propagate, modify |
||||
or convey a specific copy of the covered work, then the patent license |
||||
you grant is automatically extended to all recipients of the covered |
||||
work and works based on it. |
||||
|
||||
A patent license is "discriminatory" if it does not include within |
||||
the scope of its coverage, prohibits the exercise of, or is |
||||
conditioned on the non-exercise of one or more of the rights that are |
||||
specifically granted under this License. You may not convey a covered |
||||
work if you are a party to an arrangement with a third party that is |
||||
in the business of distributing software, under which you make payment |
||||
to the third party based on the extent of your activity of conveying |
||||
the work, and under which the third party grants, to any of the |
||||
parties who would receive the covered work from you, a discriminatory |
||||
patent license (a) in connection with copies of the covered work |
||||
conveyed by you (or copies made from those copies), or (b) primarily |
||||
for and in connection with specific products or compilations that |
||||
contain the covered work, unless you entered into that arrangement, |
||||
or that patent license was granted, prior to 28 March 2007. |
||||
|
||||
Nothing in this License shall be construed as excluding or limiting |
||||
any implied license or other defenses to infringement that may |
||||
otherwise be available to you under applicable patent law. |
||||
|
||||
12. No Surrender of Others' Freedom. |
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or |
||||
otherwise) that contradict the conditions of this License, they do not |
||||
excuse you from the conditions of this License. If you cannot convey a |
||||
covered work so as to satisfy simultaneously your obligations under this |
||||
License and any other pertinent obligations, then as a consequence you may |
||||
not convey it at all. For example, if you agree to terms that obligate you |
||||
to collect a royalty for further conveying from those to whom you convey |
||||
the Program, the only way you could satisfy both those terms and this |
||||
License would be to refrain entirely from conveying the Program. |
||||
|
||||
13. Use with the GNU Affero General Public License. |
||||
|
||||
Notwithstanding any other provision of this License, you have |
||||
permission to link or combine any covered work with a work licensed |
||||
under version 3 of the GNU Affero General Public License into a single |
||||
combined work, and to convey the resulting work. The terms of this |
||||
License will continue to apply to the part which is the covered work, |
||||
but the special requirements of the GNU Affero General Public License, |
||||
section 13, concerning interaction through a network will apply to the |
||||
combination as such. |
||||
|
||||
14. Revised Versions of this License. |
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of |
||||
the GNU General Public License from time to time. Such new versions will |
||||
be similar in spirit to the present version, but may differ in detail to |
||||
address new problems or concerns. |
||||
|
||||
Each version is given a distinguishing version number. If the |
||||
Program specifies that a certain numbered version of the GNU General |
||||
Public License "or any later version" applies to it, you have the |
||||
option of following the terms and conditions either of that numbered |
||||
version or of any later version published by the Free Software |
||||
Foundation. If the Program does not specify a version number of the |
||||
GNU General Public License, you may choose any version ever published |
||||
by the Free Software Foundation. |
||||
|
||||
If the Program specifies that a proxy can decide which future |
||||
versions of the GNU General Public License can be used, that proxy's |
||||
public statement of acceptance of a version permanently authorizes you |
||||
to choose that version for the Program. |
||||
|
||||
Later license versions may give you additional or different |
||||
permissions. However, no additional obligations are imposed on any |
||||
author or copyright holder as a result of your choosing to follow a |
||||
later version. |
||||
|
||||
15. Disclaimer of Warranty. |
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY |
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT |
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY |
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, |
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM |
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF |
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
||||
|
||||
16. Limitation of Liability. |
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS |
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY |
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE |
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF |
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD |
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), |
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGES. |
||||
|
||||
17. Interpretation of Sections 15 and 16. |
||||
|
||||
If the disclaimer of warranty and limitation of liability provided |
||||
above cannot be given local legal effect according to their terms, |
||||
reviewing courts shall apply local law that most closely approximates |
||||
an absolute waiver of all civil liability in connection with the |
||||
Program, unless a warranty or assumption of liability accompanies a |
||||
copy of the Program in return for a fee. |
||||
|
||||
END OF TERMS AND CONDITIONS |
||||
|
||||
How to Apply These Terms to Your New Programs |
||||
|
||||
If you develop a new program, and you want it to be of the greatest |
||||
possible use to the public, the best way to achieve this is to make it |
||||
free software which everyone can redistribute and change under these terms. |
||||
|
||||
To do so, attach the following notices to the program. It is safest |
||||
to attach them to the start of each source file to most effectively |
||||
state the exclusion of warranty; and each file should have at least |
||||
the "copyright" line and a pointer to where the full notice is found. |
||||
|
||||
<one line to give the program's name and a brief idea of what it does.> |
||||
Copyright (C) <year> <name of author> |
||||
|
||||
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 |
||||
the Free Software Foundation, either version 3 of the License, or |
||||
(at your option) any later version. |
||||
|
||||
This program 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 this program. If not, see <https://www.gnu.org/licenses/>. |
||||
|
||||
Also add information on how to contact you by electronic and paper mail. |
||||
|
||||
If the program does terminal interaction, make it output a short |
||||
notice like this when it starts in an interactive mode: |
||||
|
||||
<program> Copyright (C) <year> <name of author> |
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
||||
This is free software, and you are welcome to redistribute it |
||||
under certain conditions; type `show c' for details. |
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate |
||||
parts of the General Public License. Of course, your program's commands |
||||
might be different; for a GUI interface, you would use an "about box". |
||||
|
||||
You should also get your employer (if you work as a programmer) or school, |
||||
if any, to sign a "copyright disclaimer" for the program, if necessary. |
||||
For more information on this, and how to apply and follow the GNU GPL, see |
||||
<https://www.gnu.org/licenses/>. |
||||
|
||||
The GNU General Public License does not permit incorporating your program |
||||
into proprietary programs. If your program is a subroutine library, you |
||||
may consider it more useful to permit linking proprietary applications with |
||||
the library. If this is what you want to do, use the GNU Lesser General |
||||
Public License instead of this License. But first, please read |
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>. |
||||
@ -0,0 +1,35 @@
|
||||
GITV != git describe --tags
|
||||
GITC != git rev-parse --verify HEAD
|
||||
SRC != find . -type f -name '*.go' ! -name '*_test.go'
|
||||
TEST != find . -type f -name '*_test.go'
|
||||
|
||||
PREFIX ?= /usr/local
|
||||
VERSION ?= $(GITV)
|
||||
COMMIT ?= $(GITC)
|
||||
BUILDER ?= Makefile
|
||||
|
||||
GO := go
|
||||
INSTALL := install
|
||||
RM := rm
|
||||
|
||||
didder: go.mod go.sum $(SRC) |
||||
GO111MODULE=on CGO_ENABLED=0 $(GO) build -o $@ -ldflags="-s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.builtBy=$(BUILDER)"
|
||||
|
||||
.PHONY: clean |
||||
clean: |
||||
$(RM) -f didder
|
||||
|
||||
.PHONY: install |
||||
install: dither |
||||
$(INSTALL) -d $(PREFIX)/bin/
|
||||
$(INSTALL) -m 755 didder $(PREFIX)/bin/didder
|
||||
|
||||
.PHONY: uninstall |
||||
uninstall: |
||||
$(RM) -f $(PREFIX)/bin/didder
|
||||
|
||||
# Development helpers
|
||||
|
||||
.PHONY: fmt |
||||
fmt: |
||||
$(GO) fmt ./...
|
||||
@ -0,0 +1,146 @@
|
||||
# didder |
||||
|
||||
[](https://goreportcard.com/report/github.com/makeworld-the-better-one/didder) |
||||
|
||||
<p align="center"> |
||||
<img src="david_dithered.png" /> |
||||
</p> |
||||
|
||||
|
||||
didder is an extensive, fast, and accurate command-line image dithering tool. It is designed to work well for both power users as well as pipeline scripting. |
||||
It is backed by my [dithering library](https://github.com/makeworld-the-better-one/dither), and is unique in its correctness and variety of dithering algorithms. No online or offline tool I know of provides as many options, while being correct (linearizing the image). |
||||
|
||||
## Types of dithering supported |
||||
|
||||
- Random noise (in grayscale and RGB) |
||||
- **Ordered Dithering** |
||||
- Bayer matrix of any size (as long as dimensions are powers of two) |
||||
- Clustered-dot - many different preprogrammed matrices |
||||
- Some unusual horizontal or vertical line matrices |
||||
- Yours? You can provide your own ordered dithering matrix in JSON format |
||||
- **Error diffusion dithering** |
||||
- Simple 2D |
||||
- Floyd-Steinberg, False Floyd-Steinberg |
||||
- Jarvis-Judice-Ninke |
||||
- Atkinson |
||||
- Stucki |
||||
- Burkes |
||||
- Sierra/Sierra3, Sierra2, Sierra2-4A/Sierra-Lite |
||||
- [Steven Pigeon](https://hbfs.wordpress.com/2013/12/31/dithering/) |
||||
- Yours? You can provide your own error diffusion matrix in JSON format |
||||
|
||||
More methods of dithering are being worked on, such as Riemersma, Yuliluoma, and blue noise. If you'd like to help out with development of those methods, or request a new one, please make an issue in my [dither](https://github.com/makeworld-the-better-one/dither) library repo, not this one. |
||||
|
||||
## Features |
||||
- Set palette using hex codes, number 0-255 (grayscale), or SVG color names |
||||
- Optionally recolor image with a different palette after dithering |
||||
- Set dithering strength |
||||
- Image is automatically converted to grayscale if palette is grayscale |
||||
- Force image to grayscale with `--grayscale` |
||||
- Change image saturation, brightness, or contrast before dithering |
||||
- Read EXIF rotation tags by default (disabled with `--no-exif-rotation`) |
||||
- Downscale image before dithering, keeping aspect ratio |
||||
- Upscale image after dithering, without producing artifacts |
||||
- Supports input image of types JPEG, GIF (static), PNG, BMP, TIFF |
||||
- Output to PNG or GIF |
||||
- Process multiple images with one command |
||||
- Combine multiple images into an animated GIF |
||||
- Uses all CPU cores when possible |
||||
|
||||
## Installation |
||||
|
||||
### Binary |
||||
|
||||
Download a binary from the [releases](https://github.com/makeworld-the-better-one/didder/releases) page. On Unix-based systems you will have to make the file executable with `chmod +x <filename>`. You can rename the file to just `didder` for easy access, and move it to `/usr/local/bin/`. |
||||
|
||||
On Windows you will have to open a terminal or cmd window in the same directory as the EXE file, or [add it to your PATH](https://stackoverflow.com/a/41895179). |
||||
|
||||
Make sure to click "Watch" in the top right, then "Custom" > "Releases" to get notified about new releases! |
||||
|
||||
### From source |
||||
|
||||
**Requirements** |
||||
- Go 1.14 or later |
||||
- GNU Make |
||||
|
||||
Please note the Makefile does not intend to support Windows, and so there may be issues. |
||||
|
||||
```shell |
||||
git clone https://github.com/makeworld-the-better-one/didder |
||||
cd didder |
||||
# git checkout v1.2.3 # Optionally pin to a specific version instead of the latest commit |
||||
make # Might be gmake on macOS |
||||
sudo make install # If you want to install the binary for all users |
||||
``` |
||||
|
||||
## Getting started |
||||
|
||||
``` |
||||
didder [global options] command [command options] [arguments...] |
||||
``` |
||||
|
||||
Run `didder` to see some info, and the global options and commands. Run `didder help cmd` or `didder cmd --help` to see information and opions for a specific command. |
||||
Each command represents a different dithering algorithm, or set of algorithms. |
||||
|
||||
Here's a fully working command as an example: |
||||
```shell |
||||
didder --palette 'black white' -i input.jpg -o test.png bayer 16x16 |
||||
``` |
||||
This command dithers `input.jpg` to just use black and white (implicitly converting to grayscale first), using a 16x16 Bayer matrix. The result is written to `test.png`. |
||||
|
||||
As another example, here's the command used for the image at the top of the README: |
||||
```shell |
||||
didder -i david.png -o david_dithered.png --palette 'black white' --recolor 'black F273FF' --upscale 2 bayer 4x4 |
||||
``` |
||||
|
||||
If you'd like the replicate this yourself, the input image is available [here](https://upload.wikimedia.org/wikipedia/commons/7/71/Michelangelo%27s_David_-_63_grijswaarden.png). |
||||
|
||||
## What method should I use? |
||||
|
||||
Generally, using Floyd-Steinberg serpentine dithering will produce results with the fewest artifacts. The command would be: |
||||
|
||||
```shell |
||||
didder [palette and I/O options] edm --serpentine FloydSteinberg |
||||
``` |
||||
|
||||
Playing with the strength of the matrix might also be useful. The example above is at full strength, but sometimes that's too noisy. The command for 80% strength looks like this: |
||||
|
||||
```shell |
||||
didder --strength 80% [palette and I/O options] edm --serpentine FloydSteinberg |
||||
``` |
||||
|
||||
The main reason for using any other dithering algorithm would be |
||||
|
||||
- **Aesthetics** - dithering can be a cool image effect, and different methods will produce different and stronger artifacts |
||||
- **Speed** - error diffusion dithering is sequential and therefore single-threaded. But ordered dithering, like using `Bayer`, will use all available CPUs, which is much faster. |
||||
|
||||
If you want to see examples of the different dithering algorithms, you can look at [this directory](https://github.com/makeworld-the-better-one/dither/tree/master/images/output). Or try them out yourself! |
||||
|
||||
## Avoid these mistakes |
||||
|
||||
- It's easy to mess up a dithered image by scaling it manually. It's best to scale the image to the size you want before dithering (externally, or with `--width` and/or `--height`), and then leave it |
||||
- If you need to scale it up afterward, use `--upscale`, rather than another tool. This will prevent image artifacts or blurring. |
||||
- Be wary of environments where you can't make sure an image will be displayed at 100% size, pixel for pixel. Make sure nearest-neighbor scaling is being used at least. |
||||
- Dithered images must only be encoded in a lossless image format. This is why the tool only outputs PNG or GIF. |
||||
|
||||
See [here](https://github.com/makeworld-the-better-one/dither#scaling-images) for more information on these points. |
||||
|
||||
## When to use `--recolor` |
||||
|
||||
The `--recolor` flag exists because when palettes that are severely limited in terms of RGB spread are used, accurately representing the image colors with the desired palette is impossible. Instead of accuracy of color, the new goal is accuracy of luminance, or even just accuracy of contrast. For example, the original Nintendo Game Boy used a solely [green palette](https://en.wikipedia.org/wiki/List_of_video_game_console_palettes#Game_Boy). By setting `--palette` to shades of gray and then `--recolor`ing to the desired shades of green, input images will be converted to grayscale automatically and then dithered in one dimension (gray), rather than trying to dither a color image (three dimensions, RGB) into a one dimensional green palette. This is similar to "hue shifting" or "colorizing" an image in image editing software. |
||||
|
||||
For these situations, `--recolor` should usually be a palette made up of one hue, and `--palette` should be the grayscale version of that palette. The `--palette` could also be just equally spread grayscale values, which would increase the contrast but make the luminance inaccurate. |
||||
|
||||
Recoloring can also be useful for increasing contrast on a strange palette, like: `--palette 'black white' --recolor 'indigo LimeGreen'`. Setting just `--palette 'indigo LimeGreen'` would give bad (low contrast) results because that palette is not that far apart in RGB space. These "bad results" are much more pronounced when the input image is in color, because three dimensions are being reduced. |
||||
|
||||
Another usage of `--recolor` would be to invert the image colors, by providing `--palette` in reverse. But this is the same as providing the inverted image beforehand. |
||||
|
||||
If you have found other uses for `--recolor`, let me know! |
||||
|
||||
## Other info |
||||
|
||||
To increase the dithering artifacts for aesthetic effect, you can downscale the image before dithering and upscale after. Like if the image is 1000 pixels tall, your command can look like `didder --height 500 --upscale 2 [...]`. Depending on the input image size and what final size you want, you can of course just upscale as well. |
||||
|
||||
|
||||
## License |
||||
This project is licensed under the GPL v3.0. See the [LICENSE](./LICENSE) file for details. |
||||
|
After Width: | Height: | Size: 5.7 KiB |
@ -0,0 +1,22 @@
|
||||
package main |
||||
|
||||
import ( |
||||
"image" |
||||
"image/color" |
||||
) |
||||
|
||||
// Like in the dither library, see
|
||||
// https://github.com/makeworld-the-better-one/dither/blob/3714c39500bc23a87a4fa14053344f201cc5beff/draw.go#L128-L156
|
||||
// Use for specifying the recolor palette for GIF encoding
|
||||
|
||||
// fakeQuantizer implements draw.Quantizer. It ignores the provided image
|
||||
// and just returns the provided palette each time. This is useful for places that
|
||||
// only allow you to set the palette through a draw.Quantizer, like the image/gif
|
||||
// package.
|
||||
type fakeQuantizer struct { |
||||
p []color.Color |
||||
} |
||||
|
||||
func (fq *fakeQuantizer) Quantize(p color.Palette, m image.Image) color.Palette { |
||||
return fq.p |
||||
} |
||||
@ -0,0 +1,10 @@
|
||||
module github.com/makeworld-the-better-one/didder |
||||
|
||||
go 1.16 |
||||
|
||||
require ( |
||||
github.com/disintegration/imaging v1.6.2 |
||||
github.com/makeworld-the-better-one/dither/v2 v2.1.0 |
||||
github.com/urfave/cli/v2 v2.3.0 |
||||
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb |
||||
) |
||||
@ -0,0 +1,28 @@
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= |
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= |
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= |
||||
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= |
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= |
||||
github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= |
||||
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= |
||||
github.com/makeworld-the-better-one/dither/v2 v2.1.0 h1:ihYRtKQDkZwZutaCeRf1vYaq1Jqoy2mZGZR8BNZZK2I= |
||||
github.com/makeworld-the-better-one/dither/v2 v2.1.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc= |
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= |
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= |
||||
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= |
||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= |
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= |
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= |
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= |
||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= |
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= |
||||
github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= |
||||
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= |
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= |
||||
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk= |
||||
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= |
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= |
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= |
||||
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= |
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= |
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= |
||||
@ -0,0 +1,290 @@
|
||||
package main |
||||
|
||||
import ( |
||||
"errors" |
||||
"fmt" |
||||
"os" |
||||
"strings" |
||||
|
||||
"github.com/urfave/cli/v2" |
||||
) |
||||
|
||||
// Set by compiler, see Makefile
|
||||
var ( |
||||
version = "v1.0.0" |
||||
commit = "unknown" |
||||
builtBy = "unknown" |
||||
) |
||||
|
||||
func main() { |
||||
var ( |
||||
matrixTypesDesc = "This only takes one argument, but there a few types available:\n" + |
||||
helpList(1, |
||||
"A preprogrammed matrix name", |
||||
"Inline JSON of a custom matrix", |
||||
"Or a path to JSON for your custom matrix. '-' means stdin.", |
||||
) + "\n" |
||||
|
||||
decimalOrPercent = ", using a decimal or percentage." |
||||
|
||||
caseInsensitiveNames = "\nTheir names are case-insensitive, and hyphens and underscores are treated the same." |
||||
|
||||
description = ` |
||||
Colors (for --palette and --recolor) are entered as a single quoted argument. |
||||
They can be separated by spaces and commas. Colors can be formatted as hex |
||||
codes (case-insensitive, with or without the '#'), a single number from 0-255 |
||||
for grayscale, or a color name from the SVG 1.1 spec (aka the HTML or W3C |
||||
color names). |
||||
|
||||
Images are converted to grayscale automatically if the palette is grayscale. |
||||
This produces more correct results. |
||||
|
||||
Decimal range is -1.0 to 1.0. Percentage range is -100% or 100%. |
||||
|
||||
The input file path can also be parsed as a glob. This will only happen if the |
||||
path contains an asterisk. For example -i '*.jpg' will select all the .jpg |
||||
files in the current directory as input. See this page for more info on glob |
||||
pattern matching: https://golang.org/pkg/path/filepath/#Match`
|
||||
) |
||||
|
||||
app := &cli.App{ |
||||
Name: "didder", |
||||
Usage: "dither images with a variety of algorithms and processing options.", |
||||
Description: description, |
||||
UseShortOptionHandling: true, |
||||
Flags: []cli.Flag{ |
||||
&cli.StringFlag{ |
||||
Name: "strength", |
||||
Aliases: []string{"s"}, |
||||
Usage: "set strength of dithering" + decimalOrPercent + " Exceeding the range will work. A zero value will be ignored.", |
||||
}, |
||||
&cli.UintFlag{ |
||||
Name: "threads", |
||||
Aliases: []string{"j"}, |
||||
Usage: "set number of threads for ordered dithering", |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "palette", |
||||
Aliases: []string{"p"}, |
||||
Usage: "set color palette used for dithering", |
||||
Required: true, |
||||
}, |
||||
&cli.BoolFlag{ |
||||
Name: "grayscale", |
||||
Usage: "make input image(s) grayscale before dithering", |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "saturation", |
||||
Usage: "change input image(s) saturation before dithering" + decimalOrPercent, |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "brightness", |
||||
Usage: "change input image(s) brightness before dithering" + decimalOrPercent, |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "contrast", |
||||
Usage: "change input image(s) contrast before dithering" + decimalOrPercent, |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "recolor", |
||||
Aliases: []string{"r"}, |
||||
Usage: "set color palette used for replacing the dithered color palette after dithering", |
||||
}, |
||||
&cli.BoolFlag{ |
||||
Name: "no-exif-rotation", |
||||
Usage: "disable using the EXIF rotation flag to rotate the image before processing", |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "format", |
||||
Aliases: []string{"f"}, |
||||
Usage: "set output file format. Valid options are png and gif. It will auto detect from filename when possible.", |
||||
Value: "png", |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "out", |
||||
Aliases: []string{"o"}, |
||||
Usage: "set output file path or directory", |
||||
Required: true, |
||||
}, |
||||
&cli.StringSliceFlag{ |
||||
Name: "in", |
||||
Aliases: []string{"i"}, |
||||
Usage: "set input file path, specify multiple times for multiple inputs", |
||||
Required: true, |
||||
}, |
||||
&cli.BoolFlag{ |
||||
Name: "no-overwrite", |
||||
Usage: "the command will stop before overwriting an existing file. Files written before this one was encountered will stay in place.", |
||||
}, |
||||
&cli.StringFlag{ |
||||
Name: "compression", |
||||
Aliases: []string{"c"}, |
||||
Usage: "PNG compression type. Options: 'default', 'no', 'speed', 'size'", |
||||
Value: "default", |
||||
}, |
||||
&cli.Float64Flag{ |
||||
Name: "fps", |
||||
Usage: "set frames per second for animated GIF output", |
||||
}, |
||||
&cli.UintFlag{ |
||||
Name: "loop", |
||||
Usage: "number of times the animated GIF output should loop, 0 is infinite", |
||||
}, |
||||
&cli.UintFlag{ |
||||
Name: "width", |
||||
Aliases: []string{"x"}, |
||||
Usage: "set the width the input image(s) will be resized to, BEFORE dithering. Aspect ratio will be maintained if --height is not specified", |
||||
}, |
||||
&cli.UintFlag{ |
||||
Name: "height", |
||||
Aliases: []string{"y"}, |
||||
Usage: "set the height the input image(s) will be resized to, BEFORE dithering. Aspect ratio will be maintained if --width is not specified", |
||||
}, |
||||
&cli.UintFlag{ |
||||
Name: "upscale", |
||||
Aliases: []string{"u"}, |
||||
Usage: "scale image up AFTER dithering. So '2' will make the output 2 times as big as the input. Integer only.", |
||||
Value: 1, |
||||
}, |
||||
&cli.BoolFlag{ |
||||
Name: "version", |
||||
Aliases: []string{"v"}, |
||||
Usage: "get version info", |
||||
}, |
||||
}, |
||||
Commands: []*cli.Command{ |
||||
{ |
||||
Name: "random", |
||||
Usage: "grayscale and RGB random dithering", |
||||
Description: "Specify two arguments (min and max) for RGB or grayscale, or 6 (min/max for each channel) to control each RGB channel.\nArguments can be separated by commas or spaces. -0.5,0.5 is a good default.", |
||||
Flags: []cli.Flag{ |
||||
&cli.Int64Flag{ |
||||
Name: "seed", |
||||
Aliases: []string{"s"}, |
||||
Usage: "set the seed for randomization. This will also only use one thread, to keep output deterministic", |
||||
}, |
||||
}, |
||||
UseShortOptionHandling: true, |
||||
Action: random, |
||||
SkipFlagParsing: true, // Allow for numbers that start with a negative
|
||||
}, |
||||
{ |
||||
Name: "bayer", |
||||
Usage: "Bayer matrix ordered dithering", |
||||
Description: "Two arguments, for the X and Y dimension of the matrix. They can be separated by a space, comma, or 'x'.\nBoth arguments must be a power of two, with the exception of: 3x5, 5x3, and 3x3.", |
||||
UseShortOptionHandling: true, |
||||
Action: bayer, |
||||
}, |
||||
{ |
||||
Name: "odm", |
||||
Usage: "Ordered Dither Matrix", |
||||
Description: "Select or provide an ordered dithering matrix. " + matrixTypesDesc + |
||||
"Here are all the built-in ordered dithering matrices. You can find details on these matrices here:\nhttps://github.com/makeworld-the-better-one/dither/blob/v2.0.0/ordered_ditherers.go\n\n" + |
||||
helpList(1, |
||||
"ClusteredDot4x4", |
||||
"ClusteredDotDiagonal8x8", |
||||
"Vertical5x3", |
||||
"Horizontal3x5", |
||||
"ClusteredDotDiagonal6x6", |
||||
"ClusteredDotDiagonal8x8_2", |
||||
"ClusteredDotDiagonal16x16", |
||||
"ClusteredDot6x6", |
||||
"ClusteredDotSpiral5x5", |
||||
"ClusteredDotHorizontalLine", |
||||
"ClusteredDotVerticalLine", |
||||
"ClusteredDot8x8", |
||||
"ClusteredDot6x6_2", |
||||
"ClusteredDot6x6_3", |
||||
"ClusteredDotDiagonal8x8_3", |
||||
) + caseInsensitiveNames, |
||||
UseShortOptionHandling: true, |
||||
Action: odm, |
||||
}, |
||||
{ |
||||
Name: "edm", |
||||
Usage: "Error Diffusion Matrix", |
||||
Description: "Select or provide an error diffusion matrix. " + matrixTypesDesc + |
||||
"Here are all the built-in error diffusion matrices. You can find details on these matrices here:\nhttps://github.com/makeworld-the-better-one/dither/blob/v2.0.0/error_diffusers.go\n\n" + |
||||
helpList(1, |
||||
"Simple2D", |
||||
"FloydSteinberg", |
||||
"FalseFloydSteinberg", |
||||
"JarvisJudiceNinke", |
||||
"Atkinson", |
||||
"Stucki", |
||||
"Burkes", |
||||
"Sierra (or Sierra3)", |
||||
"TwoRowSierra (or Sierra2)", |
||||
"SierraLite (or Sierra2_4A)", |
||||
"StevenPigeon", |
||||
) + caseInsensitiveNames, |
||||
Flags: []cli.Flag{ |
||||
&cli.BoolFlag{ |
||||
Name: "serpentine", |
||||
Aliases: []string{"s"}, |
||||
Usage: "enable serpentine dithering", |
||||
}, |
||||
}, |
||||
UseShortOptionHandling: true, |
||||
Action: edm, |
||||
}, |
||||
}, |
||||
Before: preProcess, |
||||
Action: func(c *cli.Context) error { |
||||
return errors.New("no command specified") |
||||
}, |
||||
} |
||||
|
||||
// Handle version flag
|
||||
if len(os.Args) == 2 && (os.Args[1] == "-v" || os.Args[1] == "--version") { |
||||
fmt.Println("didder", version) |
||||
fmt.Println("Commit:", commit) |
||||
fmt.Println("Built by:", builtBy) |
||||
return |
||||
} |
||||
|
||||
// Hack around issue where required flags are still required even for help
|
||||
// https://github.com/urfave/cli/issues/1247
|
||||
if len(os.Args) == 3 { |
||||
if os.Args[1] == "h" || os.Args[1] == "help" { |
||||
// Like: didder help bayer
|
||||
for _, c := range app.Commands { |
||||
if c.Name == os.Args[2] { |
||||
cli.HelpPrinter(os.Stdout, cli.CommandHelpTemplate, c) |
||||
return |
||||
} |
||||
} |
||||
fmt.Println("no command with that name") |
||||
os.Exit(1) |
||||
} else if os.Args[len(os.Args)-1] == "-h" || os.Args[len(os.Args)-1] == "--help" { |
||||
// Like: didder bayer --help
|
||||
for _, c := range app.Commands { |
||||
if c.Name == os.Args[1] { |
||||
cli.HelpPrinter(os.Stdout, cli.CommandHelpTemplate, c) |
||||
return |
||||
} |
||||
} |
||||
fmt.Println("no command with that name") |
||||
os.Exit(1) |
||||
} |
||||
} |
||||
|
||||
err := app.Run(os.Args) |
||||
if err != nil { |
||||
if len(os.Args) == 1 { |
||||
// Just ran the command with no flags
|
||||
return |
||||
} |
||||
fmt.Println(err) |
||||
os.Exit(1) |
||||
} |
||||
} |
||||
|
||||
// helpList creates an indented list for the CLI help/usage info.
|
||||
func helpList(level int, items ...string) string { |
||||
ret := "" |
||||
for _, item := range items { |
||||
ret += strings.Repeat(" ", level) + "- " + item + "\n" |
||||
} |
||||
return ret |
||||
} |
||||
@ -0,0 +1,488 @@
|
||||
package main |
||||
|
||||
import ( |
||||
"errors" |
||||
"fmt" |
||||
"image" |
||||
"image/color" |
||||
"image/draw" |
||||
"image/gif" |
||||
"image/png" |
||||
"io" |
||||
"math" |
||||
"os" |
||||
"path/filepath" |
||||
"strconv" |
||||
"strings" |
||||
|
||||
"github.com/disintegration/imaging" |
||||
"github.com/makeworld-the-better-one/dither/v2" |
||||
"github.com/urfave/cli/v2" |
||||
"golang.org/x/image/colornames" |
||||
) |
||||
|
||||
// parsePercentArg takes a string like "0.5" or "50%" and will return a float
|
||||
// like 50 or 0.5, depending on the second argument. An empty string returns 0.
|
||||
//
|
||||
// If `maxOne` is true, then "50%" will return 0.5. Otherwise it will return 50.
|
||||
func parsePercentArg(arg string, maxOne bool) (float64, error) { |
||||
if arg == "" { |
||||
return 0, nil |
||||
} |
||||
if strings.HasSuffix(arg, "%") { |
||||
arg = arg[:len(arg)-1] |
||||
f64, err := strconv.ParseFloat(arg, 64) |
||||
if err != nil { |
||||
return 0, err |
||||
} |
||||
if maxOne { |
||||
f64 /= 100.0 |
||||
} |
||||
return f64, nil |
||||
} |
||||
f64, err := strconv.ParseFloat(arg, 64) |
||||
if !maxOne { |
||||
f64 *= 100.0 |
||||
} |
||||
return f64, err |
||||
} |
||||
|
||||
// globalFlag returns the value of flag at the top level of the command.
|
||||
// For example, with the command:
|
||||
// dither --threads 1 edm -s Simple2D
|
||||
// "threads" is a global flag, and "s" is a flag local to the edm subcommand.
|
||||
func globalFlag(flag string, c *cli.Context) interface{} { |
||||
ancestor := c.Lineage()[len(c.Lineage())-1] |
||||
if len(ancestor.Args().Slice()) == 0 { |
||||
// When the global context calls this func, the last in the lineage
|
||||
// has no args for some reason. So return the second-last instead.
|
||||
return c.Lineage()[len(c.Lineage())-2].Value(flag) |
||||
} |
||||
return ancestor.Value(flag) |
||||
} |
||||
|
||||
// globalIsSet returns a bool indicating whether the provided global flag
|
||||
// was actually set.
|
||||
func globalIsSet(flag string, c *cli.Context) bool { |
||||
ancestor := c.Lineage()[len(c.Lineage())-1] |
||||
if len(ancestor.Args().Slice()) == 0 { |
||||
// See globalFlag
|
||||
return c.Lineage()[len(c.Lineage())-2].IsSet(flag) |
||||
} |
||||
return ancestor.IsSet(flag) |
||||
} |
||||
|
||||
// parseArgs takes arguments and splits them using the provided split characters.
|
||||
func parseArgs(args []string, splitRunes string) []string { |
||||
finalArgs := make([]string, 0) |
||||
for _, arg := range args { |
||||
finalArgs = append(finalArgs, strings.FieldsFunc(arg, func(c rune) bool { |
||||
for _, c2 := range splitRunes { |
||||
if c == c2 { |
||||
return true |
||||
} |
||||
} |
||||
return false |
||||
})...) |
||||
} |
||||
return finalArgs |
||||
} |
||||
|
||||
func hex2Color(hex string) (color.RGBA, error) { |
||||
// Modified from https://github.com/lucasb-eyer/go-colorful/blob/v1.2.0/colors.go#L333
|
||||
format := "%02x%02x%02x" |
||||
var r, g, b uint8 |
||||
n, err := fmt.Sscanf(strings.ToLower(hex), format, &r, &g, &b) |
||||
if err != nil { |
||||
return color.RGBA{}, err |
||||
} |
||||
if n != 3 { |
||||
return color.RGBA{}, fmt.Errorf("%v is not a hex color", hex) |
||||
} |
||||
return color.RGBA{r, g, b, 255}, nil |
||||
} |
||||
|
||||
// parseColors takes args and turns them into a color slice. All returned
|
||||
// colors are guaranteed to only be color.RGBA.
|
||||
func parseColors(flag string, c *cli.Context) ([]color.Color, error) { |
||||
args := parseArgs([]string{globalFlag(flag, c).(string)}, " ,#") |
||||
colors := make([]color.Color, len(args)) |
||||
|
||||
for i, arg := range args { |
||||
// Try to parse as hex, then grayscale, then HTML colors, then fail
|
||||
|
||||
hexColor, err := hex2Color(arg) |
||||
if err == nil { |
||||
colors[i] = hexColor |
||||
continue |
||||
} |
||||
|
||||
n, err := strconv.Atoi(arg) |
||||
if err == nil { |
||||
if n > 255 || n < 0 { |
||||
return nil, fmt.Errorf("%s: single numbers like %d must be in the range 0-255", flag, n) |
||||
} |
||||
colors[i] = color.RGBA{uint8(n), uint8(n), uint8(n), 255} |
||||
continue |
||||
} |
||||
|
||||
htmlColor, ok := colornames.Map[strings.ToLower(arg)] |
||||
if ok { |
||||
colors[i] = htmlColor |
||||
continue |
||||
} |
||||
|
||||
return nil, fmt.Errorf("%s: %s not recognized as a hex code, number 0-255, or HTML color name", flag, arg) |
||||
} |
||||
|
||||
return colors, nil |
||||
} |
||||
|
||||
// getInputImage takes an input image arg and returns an image that has
|
||||
// modifications applied.
|
||||
func getInputImage(arg string, c *cli.Context) (image.Image, error) { |
||||
var img image.Image |
||||
var err error |
||||
|
||||
if arg == "-" { |
||||
img, err = imaging.Decode(os.Stdin, autoOrientation) |
||||
} else { |
||||
img, err = imaging.Open(arg, autoOrientation) |
||||
} |
||||
if err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
if width != 0 || height != 0 { |
||||
// Box sampling is quick and fast, and better then others at downscaling
|
||||
// Downscaling will be a much more common use case for pre-dither scaling
|
||||
// then upscaling
|
||||
// https://pkg.go.dev/github.com/disintegration/imaging#ResampleFilter
|
||||
// https://en.wikipedia.org/wiki/Image_scaling#Box_sampling
|
||||
img = imaging.Resize(img, width, height, imaging.Box) |
||||
} |
||||
|
||||
if grayscale { |
||||
img = imaging.Grayscale(img) |
||||
} |
||||
if saturation != 0 { |
||||
img = imaging.AdjustSaturation(img, saturation) |
||||
} |
||||
if contrast != 0 { |
||||
img = imaging.AdjustContrast(img, contrast) |
||||
} |
||||
if brightness != 0 { |
||||
img = imaging.AdjustBrightness(img, brightness) |
||||
} |
||||
|
||||
return img, nil |
||||
} |
||||
|
||||
// From dither library
|
||||
|
||||
func copyImage(dst draw.Image, src image.Image) { |
||||
draw.Draw(dst, src.Bounds(), src, src.Bounds().Min, draw.Src) |
||||
} |
||||
func copyOfImage(img image.Image) *image.RGBA { |
||||
dst := image.NewRGBA(img.Bounds()) |
||||
copyImage(dst, img) |
||||
return dst |
||||
} |
||||
|
||||
///////
|
||||
|
||||
// recolor will recolor the image pixels if necessary. It should be called
|
||||
// before writing any image. It should only be given a dithered image.
|
||||
// It will copy an image if it cannot draw on it.
|
||||
//
|
||||
// If the input image is *image.Paletted, the output will always be of that type too.
|
||||
func recolor(src image.Image) image.Image { |
||||
if len(recolorPalette) == 0 { |
||||
return src |
||||
} |
||||
|
||||
// Modified and returned value
|
||||
var img draw.Image |
||||
|
||||
// Map of original palette colors to recolor colors
|
||||
paletteToRecolor := make(map[color.Color]color.Color) |
||||
for i, c := range palette { |
||||
paletteToRecolor[c] = recolorPalette[i] |
||||
} |
||||
|
||||
// Fast path for paletted images
|
||||
if p, ok := src.(*image.Paletted); ok { |
||||
// For each color in the image palette, replace it with the equivalent
|
||||
// recolor palette color
|
||||
for i, c := range p.Palette { |
||||
p.Palette[i] = paletteToRecolor[color.RGBAModel.Convert(c)] |
||||
} |
||||
return p |
||||
} |
||||
|
||||
var ok bool |
||||
if img, ok = src.(draw.Image); !ok { |
||||
// Can't be changed
|
||||
// Instead make a copy and recolor and return that
|
||||
img = copyOfImage(src) |
||||
} |
||||
|
||||
// Swap each image pixel
|
||||
|
||||
b := img.Bounds() |
||||
for y := b.Min.Y; y < b.Max.Y; y++ { |
||||
for x := b.Min.X; x < b.Max.X; x++ { |
||||
// Image pixel -> convert to RGBA -> find palette index using `m`
|
||||
// -> find recolor palette color using index -> set color
|
||||
img.Set(x, y, paletteToRecolor[color.RGBAModel.Convert(img.At(x, y))]) |
||||
} |
||||
} |
||||
return img |
||||
} |
||||
|
||||
// postProcImage post-processes the image, applying recolor and upscaling.
|
||||
//
|
||||
// If the input image is *image.Paletted, the output will always be of that type too.
|
||||
func postProcImage(img image.Image) image.Image { |
||||
img = recolor(img) |
||||
|
||||
var palette color.Palette |
||||
if p, ok := img.(*image.Paletted); ok { |
||||
palette = p.Palette |
||||
} |
||||
|
||||
if upscale == 1 { |
||||
return img |
||||
} |
||||
|
||||
img = imaging.Resize( |
||||
img, |
||||
img.Bounds().Dx()*upscale, |
||||
0, |
||||
imaging.NearestNeighbor, |
||||
) |
||||
|
||||
if len(palette) == 0 { |
||||
return img |
||||
} |
||||
|
||||
pi := image.NewPaletted(img.Bounds(), palette) |
||||
copyImage(pi, img) |
||||
return pi |
||||
} |
||||
|
||||
// processImages dithers all the input images and writes them.
|
||||
// It handles all image I/O.
|
||||
func processImages(d *dither.Ditherer, c *cli.Context) error { |
||||
outPath := globalFlag("out", c).(string) |
||||
|
||||
// Setup for if it's an animated GIF output
|
||||
// Overall adapted from:
|
||||
// https://github.com/makeworld-the-better-one/dither/blob/v2.0.0/examples/gif_animation.go
|
||||
|
||||
isAnimGIF := len(inputImages) > 1 && outFormat == "gif" && !outIsDir |
||||
|
||||
var frames []*image.Paletted |
||||
if isAnimGIF { |
||||
frames = make([]*image.Paletted, len(inputImages)) |
||||
} |
||||
|
||||
var delays []int |
||||
var animGIF gif.GIF |
||||
if isAnimGIF { |
||||
if !globalIsSet("fps", c) { |
||||
return errors.New("output will be animated GIF, but --fps flag is not set") |
||||
} |
||||
|
||||
delays = make([]int, len(inputImages)) |
||||
for i := range delays { |
||||
// Round to the nearest possible frame rate supported by the GIF format
|
||||
// See for details: https://superuser.com/a/1449370
|
||||
// A rolling average is not done because it's harder to code and looks
|
||||
// bad: https://superuser.com/q/1459724
|
||||
//
|
||||
// Lowest allowed delay is 1, or 100 FPS.
|
||||
delays[i] = int(math.Max(math.Round(100.0/globalFlag("fps", c).(float64)), 1)) |
||||
} |
||||
|
||||
loopCount := int(globalFlag("loop", c).(uint)) |
||||
if loopCount == 1 { |
||||
// Looping once is set using -1 in the image/gif library
|
||||
loopCount = -1 |
||||
} else if loopCount != 0 { |
||||
// The CLI flag is equal to the number of times looped
|
||||
// But for gif.GIF.LoopCount, "the animation is looped LoopCount+1 times."
|
||||
loopCount -= 1 |
||||
} |
||||
animGIF = gif.GIF{ |
||||
Image: frames, |
||||
Delay: delays, |
||||
LoopCount: loopCount, |
||||
} |
||||
} |
||||
|
||||
// Go through images and dither (and write if not an animated GIF)
|
||||
|
||||
for i, inputPath := range inputImages { |
||||
|
||||
img, err := getInputImage(inputPath, c) |
||||
if err != nil { |
||||
return fmt.Errorf("error loading '%s': %w", inputPath, err) |
||||
} |
||||
|
||||
if isAnimGIF { |
||||
if i == 0 { |
||||
// Use the config of the first image for the animated GIF
|
||||
var config image.Config |
||||
frames[0], config = d.DitherPalettedConfig(img) |
||||
frames[0] = postProcImage(frames[0]).(*image.Paletted) |
||||
|
||||
if len(recolorPalette) == 0 { |
||||
animGIF.Config = config |
||||
} else { |
||||
// Same config as the Ditherer would give, but with the recolor palette
|
||||
animGIF.Config = image.Config{ |
||||
ColorModel: color.Palette(recolorPalette), |
||||
Width: frames[0].Bounds().Dx(), |
||||
Height: frames[0].Bounds().Dy(), |
||||
} |
||||
} |
||||
continue |
||||
} |
||||
// Later frames
|
||||
if upscale == 1 && !img.Bounds().Eq(frames[0].Bounds()) { |
||||
// Upscale check is needed because otherwise frames[0] will be upscaled and not match
|
||||
return fmt.Errorf( |
||||
"image '%s' isn't the same size as '%s', all sizes must match to create an animated GIF", |
||||
inputPath, inputImages[0], |
||||
) |
||||
} |
||||
frames[i] = d.DitherPaletted(img) |
||||
frames[i] = postProcImage(frames[i]).(*image.Paletted) |
||||
|
||||
// Do bounds check now, if it didn't happen before because of upscaling
|
||||
if upscale != 1 && !frames[i].Bounds().Eq(frames[0].Bounds()) { |
||||
return fmt.Errorf( |
||||
"image '%s' isn't the same size as '%s', all sizes must match to create an animated GIF", |
||||
inputPath, inputImages[0], |
||||
) |
||||
} |
||||
continue |
||||
} |
||||
|
||||
// Not an animated GIF
|
||||
// Write out the image now
|
||||
// (partially copied below, outside the loop)
|
||||
|
||||
var file io.WriteCloser |
||||
var path string |
||||
|
||||
if outPath == "-" { |
||||
file = os.Stdout |
||||
path = "stdout" |
||||
} else { |
||||
if outIsDir { |
||||
// Inside output directory
|
||||
// Same name as input file but potentially different extension
|
||||
path = filepath.Join( |
||||
outPath, |
||||
strings.TrimSuffix(filepath.Base(inputPath), filepath.Ext(inputPath))+"."+outFormat, |
||||
) |
||||
} else { |
||||
// Output file path
|
||||
path = outPath |
||||
} |
||||
|
||||
file, err = os.OpenFile(path, outFileFlags, 0644) |
||||
if err != nil { |
||||
return fmt.Errorf("'%s': %w", path, err) |
||||
} |
||||
} |
||||
|
||||
if outFormat == "png" { |
||||
img = postProcImage(d.Dither(img)) |
||||
err = (&png.Encoder{CompressionLevel: compLevel}).Encode(file, img) |
||||
if err != nil { |
||||
defer file.Close() // Keep (possibly stdout) open to write error messages then close
|
||||
return fmt.Errorf("error writing PNG to '%s': %w", path, err) |
||||
} |
||||
file.Close() |
||||
} else { |
||||
// Output static GIF
|
||||
// Adapted from:
|
||||
// https://github.com/makeworld-the-better-one/dither/blob/v2.0.0/examples/gif_image.go
|
||||
|
||||
if !postProcNeeded { |
||||
// No post
|
||||
// GIF encoder calls the ditherer
|
||||
err = gif.Encode( |
||||
file, img, |
||||
&gif.Options{ |
||||
NumColors: len(palette), |
||||
Quantizer: d, |
||||
Drawer: d, |
||||
}, |
||||
) |
||||
} else { |
||||
// Dither and post-process first, and use recolor palette if needed
|
||||
// The gif package will not change the image if it's *image.Paletted
|
||||
// So even though Drawer is not set to the ditherer it'll be fine,
|
||||
// and the default FloydSteinberg Drawer won't be used
|
||||
|
||||
img = postProcImage(d.DitherPaletted(img)) |
||||
|
||||
var quantizer draw.Quantizer |
||||
if len(recolorPalette) == 0 { |
||||
quantizer = d |
||||
} else { |
||||
quantizer = &fakeQuantizer{recolorPalette} |
||||
} |
||||
err = gif.Encode( |
||||
file, img, |
||||
&gif.Options{ |
||||
NumColors: len(recolorPalette), |
||||
Quantizer: quantizer, |
||||
}, |
||||
) |
||||
} |
||||
if err != nil { |
||||
defer file.Close() |
||||
return fmt.Errorf("error writing GIF to '%s': %w", path, err) |
||||
} |
||||
file.Close() |
||||
} |
||||
} |
||||
|
||||
// Either all images have been written and everything is done, or the animated GIF
|
||||
// needs to be saved.
|
||||
|
||||
if !isAnimGIF { |
||||
return nil |
||||
} |
||||
|
||||
// Partially copied from above
|
||||
|
||||
var file io.WriteCloser |
||||
var path string |
||||
var err error |
||||
|
||||
if outPath == "-" { |
||||
file = os.Stdout |
||||
path = "stdout" |
||||
} else { |
||||
// Output file path
|
||||
path = outPath |
||||
file, err = os.OpenFile(path, outFileFlags, 0644) |
||||
if err != nil { |
||||
return fmt.Errorf("'%s': %w", path, err) |
||||
} |
||||
} |
||||
|
||||
err = gif.EncodeAll(file, &animGIF) |
||||
if err != nil { |
||||
defer file.Close() |
||||
return fmt.Errorf("error writing GIF to '%s': %w", path, err) |
||||
} |
||||
file.Close() |
||||
return nil |
||||
} |
||||
@ -0,0 +1,500 @@
|
||||
package main |
||||
|
||||
import ( |
||||
"encoding/json" |
||||
"errors" |
||||
"fmt" |
||||
"image/color" |
||||
"image/png" |
||||
"io/ioutil" |
||||
"math/rand" |
||||
"os" |
||||
"path/filepath" |
||||
"runtime" |
||||
"strconv" |
||||
"strings" |
||||
"time" |
||||
|
||||
"github.com/disintegration/imaging" |
||||
"github.com/makeworld-the-better-one/dither/v2" |
||||
"github.com/urfave/cli/v2" |
||||
) |
||||
|
||||
const ( |
||||
unsupportedFormat string = "'%s' is an unsupported format, only 'png' or 'gif' are accepted" |
||||
) |
||||
|
||||
var ( |
||||
// palette stores the palette colors. It's set after pre-processing.
|
||||
// Guaranteed to only hold color.RGBA.
|
||||
palette []color.Color |
||||
|
||||
// recolorPalette stores the recolor palette colors. It's set after pre-processing.
|
||||
// Guaranteed to only hold color.RGBA.
|
||||
recolorPalette []color.Color |
||||
|
||||
grayscale bool |
||||
|
||||
// Range -100,100
|
||||
|
||||
saturation float64 |
||||
brightness float64 |
||||
contrast float64 |
||||
|
||||
autoOrientation imaging.DecodeOption |
||||
|
||||
inputImages []string |
||||
outFormat string // "png" or "gif"
|
||||
outIsDir bool |
||||
|
||||
compLevel png.CompressionLevel |
||||
|
||||
outFileFlags int // For os.OpenFile
|
||||
|
||||
width int |
||||
height int |
||||
// upscale will always be 1 or above
|
||||
upscale int |
||||
|
||||
ditherer *dither.Ditherer |
||||
|
||||
// range [-1, 1]
|
||||
strength float32 |
||||
|
||||
// Is post-processing needed?
|
||||
postProcNeeded bool |
||||
) |
||||
|
||||
// preProcess is automatically called by the app before anything else.
|
||||
// It's run in the global context.
|
||||
func preProcess(c *cli.Context) error { |
||||
runtime.GOMAXPROCS(int(c.Uint("threads"))) |
||||
|
||||
var err error |
||||
palette, err = parseColors("palette", c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
if len(palette) < 2 { |
||||
return errors.New("the palette must have at least two colors") |
||||
} |
||||
|
||||
if c.String("recolor") != "" { |
||||
recolorPalette, err = parseColors("recolor", c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
if len(recolorPalette) != len(palette) { |
||||
return errors.New("recolor palette must have the same number of colors as the initial palette") |
||||
} |
||||
} |
||||
|
||||
// Check if palette is grayscale and make image grayscale
|
||||
// Or if the user forces it
|
||||
|
||||
grayscale = true |
||||
if !c.Bool("grayscale") { |
||||
// Grayscale isn't specified by the user
|
||||
// So check to see if palette is grayscale
|
||||
for _, c := range palette { |
||||
r, g, b, _ := c.RGBA() |
||||
if r != g || g != b { |
||||
grayscale = false |
||||
} |
||||
} |
||||
} |
||||
|
||||
saturation, err = parsePercentArg(c.String("saturation"), false) |
||||
if err != nil { |
||||
return fmt.Errorf("saturation: %w", err) |
||||
} |
||||
if saturation <= -100 { |
||||
grayscale = true |
||||
saturation = 0 |
||||
} |
||||
brightness, err = parsePercentArg(c.String("brightness"), false) |
||||
if err != nil { |
||||
return fmt.Errorf("brightness: %w", err) |
||||
} |
||||
contrast, err = parsePercentArg(c.String("contrast"), false) |
||||
if err != nil { |
||||
return fmt.Errorf("contrast: %w", err) |
||||
} |
||||
|
||||
autoOrientation = imaging.AutoOrientation(!c.Bool("no-exif-rotation")) |
||||
|
||||
inputImages = make([]string, 0) |
||||
for _, path := range c.StringSlice("in") { |
||||
if strings.Contains(path, "*") { |
||||
// Parse as glob
|
||||
paths, err := filepath.Glob(path) |
||||
if err != nil { |
||||
return fmt.Errorf("bad glob pattern '%s': %w", path, err) |
||||
} |
||||
inputImages = append(inputImages, paths...) |
||||
} else { |
||||
inputImages = append(inputImages, path) |
||||
} |
||||
} |
||||
|
||||
formatVal := c.String("format") |
||||
if formatVal != "png" && formatVal != "gif" { |
||||
return fmt.Errorf(unsupportedFormat, formatVal) |
||||
} |
||||
|
||||
// Figure out output format
|
||||
|
||||
outVal := c.String("out") |
||||
|
||||
if outVal == "-" { |
||||
// Outputting to stdout, so just use whatever the flag is
|
||||
outFormat = formatVal |
||||
} else { |
||||
// Outputting to dir or file
|
||||
|
||||
outFI, err := os.Stat(outVal) |
||||
|
||||
if err == nil && outFI.IsDir() { |
||||
// Exists and is a directory
|
||||
// Just use what the flag is
|
||||
outFormat = formatVal |
||||
outIsDir = true |
||||
|
||||
} else { |
||||
// Outputting to file, that already exists
|
||||
// Or something that doesn't exist - assumed to be a file
|
||||
|
||||
if !c.IsSet("format") { |
||||
// Format wasn't set, so ignore default value of "png"
|
||||
// Try to figure out format from output filename
|
||||
ext := strings.TrimPrefix(filepath.Ext(outVal), ".") |
||||
if ext == "png" || ext == "gif" { |
||||
// Acceptable extension
|
||||
outFormat = ext |
||||
} else if ext == "" { |
||||
// No extension, use default format
|
||||
outFormat = "png" |
||||
} else { |
||||
// Unsupported extension and no format flag override
|
||||
return fmt.Errorf(unsupportedFormat, ext) |
||||
} |
||||
} else { |
||||
// Format flag was set, so ignore what the file looks like
|
||||
outFormat = formatVal |
||||
} |
||||
} |
||||
|
||||
} |
||||
|
||||
// Multiple input images are only valid if the output is GIF,
|
||||
// or if the output points to a directory.
|
||||
if len(inputImages) > 1 && (outFormat != "gif" && !outIsDir) { |
||||
return fmt.Errorf("multiple input images are only allowed if the output format is GIF, or an existing directory") |
||||
} |
||||
|
||||
if outFormat == "gif" && len(palette) > 256 { |
||||
return errors.New("the GIF format only supports 256 colors or less in the palette") |
||||
} |
||||
|
||||
// Set PNG compression type
|
||||
|
||||
switch c.String("compression") { |
||||
case "default": |
||||
compLevel = png.DefaultCompression |
||||
case "no": |
||||
compLevel = png.NoCompression |
||||
case "speed": |
||||
compLevel = png.BestSpeed |
||||
case "size": |
||||
compLevel = png.BestCompression |
||||
default: |
||||
return fmt.Errorf("invalid compression type '%s'", c.String("compression")) |
||||
} |
||||
|
||||
if c.Bool("no-overwrite") { |
||||
outFileFlags = os.O_WRONLY | os.O_CREATE | os.O_EXCL |
||||
} else { |
||||
outFileFlags = os.O_WRONLY | os.O_CREATE | os.O_TRUNC |
||||
} |
||||
|
||||
// Set here for convenience
|
||||
width = int(c.Uint("width")) |
||||
height = int(c.Uint("height")) |
||||
upscale = int(c.Uint("upscale")) |
||||
if upscale == 0 { |
||||
// Invalid
|
||||
upscale = 1 |
||||
} |
||||
|
||||
ditherer = dither.NewDitherer(palette) |
||||
|
||||
tmp, err := parsePercentArg(c.String("strength"), true) |
||||
if err != nil { |
||||
return fmt.Errorf("strength: %w", err) |
||||
} |
||||
strength = float32(tmp) |
||||
if strength == 0 { |
||||
// Ignore
|
||||
strength = 1 |
||||
} |
||||
|
||||
if len(recolorPalette) != 0 || upscale > 1 { |
||||
postProcNeeded = true |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
|
||||
func random(c *cli.Context) error { |
||||
args := parseArgs(c.Args().Slice(), " ,") |
||||
|
||||
// Manually parse out --seed, -s flag
|
||||
// The manual parsing is done to allow for numbers that start with a negative
|
||||
// which would otherwise be interpreted as flags
|
||||
|
||||
seedIsSet := false |
||||
var seed int64 |
||||
|
||||
if len(args) >= 1 { |
||||
if args[0] == "--seed" || args[0] == "-s" { |
||||
if len(args) >= 2 { |
||||
// Parse and set seed value
|
||||
|
||||
var err error |
||||
seed, err = strconv.ParseInt(args[1], 10, 64) |
||||
if err != nil { |
||||
return fmt.Errorf("couldn't parse seed value: %w", err) |
||||
} |
||||
seedIsSet = true |
||||
args = args[2:] |
||||
} else { |
||||
// Seed flag but no value after it
|
||||
return errors.New("no value after seed flag") |
||||
} |
||||
} else if args[0] == "--help" || args[0] == "-h" { |
||||
// Display the help
|
||||
return cli.ShowCommandHelp(c, "random") |
||||
} |
||||
} |
||||
|
||||
if len(args) != 2 && len(args) != 6 { |
||||
return errors.New("random needs 2 or 6 arguments") |
||||
} |
||||
|
||||
floatArgs := make([]float32, len(args)) |
||||
for i, arg := range args { |
||||
f64, err := parsePercentArg(arg, true) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
floatArgs[i] = float32(f64) |
||||
} |
||||
|
||||
if seedIsSet { |
||||
rand.Seed(seed) |
||||
} else { |
||||
// Seed with something that won't repeat next use
|
||||
rand.Seed(time.Now().UnixNano()) |
||||
} |
||||
|
||||
if len(floatArgs) == 2 { |
||||
if grayscale || saturation <= -100 { |
||||
ditherer.Mapper = dither.RandomNoiseGrayscale(floatArgs[0], floatArgs[1]) |
||||
} else { |
||||
// Use the two arguments for all channels
|
||||
ditherer.Mapper = dither.RandomNoiseRGB(floatArgs[0], floatArgs[1], floatArgs[0], floatArgs[1], floatArgs[0], floatArgs[1]) |
||||
} |
||||
} else { |
||||
ditherer.Mapper = dither.RandomNoiseRGB(floatArgs[0], floatArgs[1], floatArgs[2], floatArgs[3], floatArgs[4], floatArgs[5]) |
||||
} |
||||
if seedIsSet { |
||||
// Make deterministic
|
||||
ditherer.SingleThreaded = true |
||||
} |
||||
|
||||
err := processImages(ditherer, c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
func bayer(c *cli.Context) error { |
||||
args := parseArgs(c.Args().Slice(), " ,x") |
||||
|
||||
if len(args) != 2 { |
||||
return errors.New("bayer needs 2 arguments exactly") |
||||
} |
||||
|
||||
uintArgs := make([]uint, 2) |
||||
for i, arg := range args { |
||||
u64, err := strconv.ParseUint(arg, 10, 0) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
uintArgs[i] = uint(u64) |
||||
} |
||||
|
||||
// Validate args to prevent dither.Bayer from panicking
|
||||
|
||||
x, y := uintArgs[0], uintArgs[1] |
||||
if x == 0 || y == 0 { |
||||
return errors.New("neither dimension can be 0") |
||||
} |
||||
if x == 1 && y == 1 { |
||||
return errors.New("a 1x1 matrix will not dither the image") |
||||
} |
||||
if ((x&(x-1)) != 0 || (y&(y-1)) != 0) && // Power of two?
|
||||
!((x == 3 && y == 3) || (x == 5 && y == 3) || (x == 3 && y == 5)) { // Exceptions
|
||||
// Not a power of two, and not an exception
|
||||
return errors.New("both dimensions must be powers of two") |
||||
} |
||||
|
||||
ditherer.Mapper = dither.Bayer(x, y, strength) |
||||
|
||||
err := processImages(ditherer, c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
var odmName = map[string]dither.OrderedDitherMatrix{ |
||||
"clustereddot4x4": dither.ClusteredDot4x4, |
||||
"clustereddotdiagonal8x8": dither.ClusteredDotDiagonal8x8, |
||||
"vertical5x3": dither.Vertical5x3, |
||||
"horizontal3x5": dither.Horizontal3x5, |
||||
"clustereddotdiagonal6x6": dither.ClusteredDotDiagonal6x6, |
||||
"clustereddotdiagonal8x8_2": dither.ClusteredDotDiagonal8x8_2, |
||||
"clustereddotdiagonal16x16": dither.ClusteredDotDiagonal16x16, |
||||
"clustereddot6x6": dither.ClusteredDot6x6, |
||||
"clustereddotspiral5x5": dither.ClusteredDotSpiral5x5, |
||||
"clustereddothorizontalline": dither.ClusteredDotHorizontalLine, |
||||
"clustereddotverticalline": dither.ClusteredDotVerticalLine, |
||||
"clustereddot8x8": dither.ClusteredDot8x8, |
||||
"clustereddot6x6_2": dither.ClusteredDot6x6_2, |
||||
"clustereddot6x6_3": dither.ClusteredDot6x6_3, |
||||
"clustereddotdiagonal8x8_3": dither.ClusteredDotDiagonal8x8_3, |
||||
} |
||||
|
||||
func odm(c *cli.Context) error { |
||||
args := c.Args().Slice() |
||||
|
||||
if len(args) != 1 { |
||||
return errors.New("odm only accepts one argument") |
||||
} |
||||
|
||||
var matrix dither.OrderedDitherMatrix |
||||
|
||||
matrix, ok := odmName[strings.ReplaceAll(strings.ToLower(args[0]), "-", "_")] |
||||
if !ok { |
||||
// Either inline JSON, path to file, or an error
|
||||
err := json.Unmarshal([]byte(args[0]), &matrix) |
||||
if err != nil { |
||||
bytes, err := ioutil.ReadFile(args[0]) |
||||
if err != nil { |
||||
return errors.New("couldn't process argument as matrix name, inline JSON, or path to accessible JSON file") |
||||
} |
||||
err = json.Unmarshal(bytes, &matrix) |
||||
if err != nil { |
||||
return errors.New("couldn't process argument as matrix name, inline JSON, or path to accessible JSON file") |
||||
} |
||||
} |
||||
|
||||
// Validate matrix
|
||||
|
||||
if matrix.Max == 0 { |
||||
return errors.New("the max value of the matrix cannot be 0") |
||||
} |
||||
if len(matrix.Matrix) == 0 { |
||||
return errors.New("matrix is empty") |
||||
} |
||||
// Is it rectangular?
|
||||
width := len(matrix.Matrix[0]) |
||||
if width == 0 { |
||||
return errors.New("matrix has empty row") |
||||
} |
||||
for _, row := range matrix.Matrix { |
||||
if len(row) != width { |
||||
return errors.New("matrix is not rectangular, all rows must be the same length") |
||||
} |
||||
} |
||||
} |
||||
|
||||
ditherer.Mapper = dither.PixelMapperFromMatrix(matrix, strength) |
||||
|
||||
err := processImages(ditherer, c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
return nil |
||||
} |
||||
|
||||
var edmName = map[string]dither.ErrorDiffusionMatrix{ |
||||
"simple2d": dither.Simple2D, |
||||
"floydsteinberg": dither.FloydSteinberg, |
||||
"falsefloydsteinberg": dither.FalseFloydSteinberg, |
||||
"jarvisjudiceninke": dither.JarvisJudiceNinke, |
||||
"atkinson": dither.Atkinson, |
||||
"stucki": dither.Stucki, |
||||
"burkes": dither.Burkes, |
||||
"sierra": dither.Sierra, |
||||
"sierra3": dither.Sierra3, |
||||
"tworowsierra": dither.TwoRowSierra, |
||||
"sierralite": dither.SierraLite, |
||||
"sierra2_4a": dither.Sierra2_4A, |
||||
"stevenpigeon": dither.StevenPigeon, |
||||
} |
||||
|
||||
func edm(c *cli.Context) error { |
||||
args := c.Args().Slice() |
||||
|
||||
if len(args) != 1 { |
||||
return errors.New("edm only accepts one argument") |
||||
} |
||||
|
||||
var matrix dither.ErrorDiffusionMatrix |
||||
|
||||
matrix, ok := edmName[strings.ReplaceAll(strings.ToLower(args[0]), "-", "_")] |
||||
if !ok { |
||||
// Either inline JSON, path to file, or an error
|
||||
err := json.Unmarshal([]byte(args[0]), &matrix) |
||||
if err != nil { |
||||
bytes, err := ioutil.ReadFile(args[0]) |
||||
if err != nil { |
||||
return errors.New("couldn't process argument as matrix name, inline JSON, or path to accessible JSON file") |
||||
} |
||||
err = json.Unmarshal(bytes, &matrix) |
||||
if err != nil { |
||||
return errors.New("couldn't process argument as matrix name, inline JSON, or path to accessible JSON file") |
||||
} |
||||
} |
||||
|
||||
// Validate matrix
|
||||
|
||||
if len(matrix) == 0 { |
||||
return errors.New("matrix is empty") |
||||
} |
||||
// Is it rectangular?
|
||||
width := len(matrix[0]) |
||||
if width == 0 { |
||||
return errors.New("matrix has empty row") |
||||
} |
||||
for _, row := range matrix { |
||||
if len(row) != width { |
||||
return errors.New("matrix is not rectangular, all rows must be the same length") |
||||
} |
||||
} |
||||
} |
||||
|
||||
ditherer.Matrix = dither.ErrorDiffusionStrength(matrix, strength) |
||||
if c.Bool("serpentine") { |
||||
ditherer.Serpentine = true |
||||
} |
||||
|
||||
err := processImages(ditherer, c) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
return nil |
||||
} |
||||
Loading…
Reference in new issue