summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaslo Hunhold <dev@frign.de>2017-04-14 22:26:03 +0200
committerLaslo Hunhold <dev@frign.de>2017-04-14 22:26:03 +0200
commit4aa840bd871694cca0ae1608eab1086eef7d228b (patch)
tree0f39f31503883cd78a19309bb4b6ed19f255e698
parenta5a5706f16408ce181775d319b264d03e67819f3 (diff)
Remove the need of '#' for alpha masks
To be honest, it can happen too easily that the user forgets to put the colour in quotation marks, yielding in the rest of the pipeline to be discarded as a comment.
-rw-r--r--ff2jpg.14
-rw-r--r--ff2ppm.14
-rw-r--r--util.c4
3 files changed, 4 insertions, 8 deletions
diff --git a/ff2jpg.1 b/ff2jpg.1
index 5c8e97a..4555a66 100644
--- a/ff2jpg.1
+++ b/ff2jpg.1
@@ -24,7 +24,7 @@ writes a diagnostic message to stderr.
.It Fl b Ar colour
Mix the background alpha channel with
.Ar colour
-specified as #rgb, #rrggbb or #rrrrggggbbbb. The default is #fff.
+specified as rgb, rrggbb or rrrrggggbbbb. The default is fff.
.It Fl o
Optimize the Huffman table, which reduces the file size but takes longer.
.It Fl q Ar quality
@@ -46,7 +46,7 @@ $
.Pp
$ bunzip2 < image.ff.bz2 |
.Nm
--b '#00ff00' -q 90 > image.jpg
+-b 0f0 -q 90 > image.jpg
.Sh SEE ALSO
.Xr bzip2 1 ,
.Xr farbfeld 5
diff --git a/ff2ppm.1 b/ff2ppm.1
index 9bebf7a..feba2f3 100644
--- a/ff2ppm.1
+++ b/ff2ppm.1
@@ -23,7 +23,7 @@ writes a diagnostic message to stderr.
.Ar colour
Mix the background alpha channel with
.Ar colour
-specified as #rgb, #rrggbb or #rrrrggggbbbb. The default is #fff.
+specified as rgb, rrggbb or rrrrggggbbbb. The default is fff.
.El
.Sh EXIT STATUS
.Bl -tag -width Ds
@@ -39,7 +39,7 @@ $
.Pp
$ bunzip2 < image.ff.bz2 |
.Nm
--b '#00ff00' > image.ppm
+-b 0f0 > image.ppm
.Sh SEE ALSO
.Xr bzip2 1 ,
.Xr farbfeld 5
diff --git a/util.c b/util.c
index ea933ca..ba139b4 100644
--- a/util.c
+++ b/util.c
@@ -57,10 +57,6 @@ parse_mask(const char *s, uint16_t mask[3])
unsigned int col[3], colfac;
char fmt[] = "%#x%#x%#x";
- if ((s++)[0] != '#') {
- return 1;
- }
-
slen = strlen(s);
if (slen != 3 && slen != 6 && slen != 12) {
return 1;