From 442d034243dc1a8579f163de0e9823af4f7f5fc3 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 14 Feb 2018 17:03:27 -0500
Subject: Write at least 1 for each component of sBIT in gfxx

PNG requires each to be 0 < x <= depth. ImageMagick actually checks.
---
 bin/gfxx.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/gfxx.c b/bin/gfxx.c
index 6ccb17cb..5f05650c 100644
--- a/bin/gfxx.c
+++ b/bin/gfxx.c
@@ -28,9 +28,11 @@
 #include <unistd.h>
 #include <zlib.h>
 
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MASK(b) ((1 << (b)) - 1)
+
 #define RGB(r, g, b) ((uint32_t)(r) << 16 | (uint32_t)(g) << 8 | (uint32_t)(b))
 #define GRAY(n) RGB(n, n, n)
-#define MASK(b) ((1 << (b)) - 1)
 
 static enum {
     COLOR_INDEXED,
@@ -351,7 +353,8 @@ static void pngDump(uint32_t *src, size_t srcWidth, size_t srcHeight) {
         pngWrite(options, strlen(options));
     }
     PNG_CHUNK("sBIT", 3) {
-        pngWrite(&bits[R], 3);
+        uint8_t sbit[3] = { MAX(bits[R], 1), MAX(bits[G], 1), MAX(bits[B], 1) };
+        pngWrite(sbit, sizeof(sbit));
     }
     PNG_CHUNK("IDAT", dataSize) {
         pngWrite(data, dataSize);
-- 
cgit 1.4.1

.config?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;follow=1'>commit</a> <a href='/src/diff/.config?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/.config'>
<input type='hidden' name='id' value='328f307298d62f81bb2eb355b0fc61ce7a86e346'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;follow=1'>root</a>/<a href='/src/log/.config?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;follow=1'>.config</a> (<a href='/src/log/.config?id=328f307298d62f81bb2eb355b0fc61ce7a86e346'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/.config?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2013-05-04 14:18:42 -0400'>2013-05-04</span></td><td><a href='/src/commit/.config/awesome/themes/Tomorrow-Night/theme.lua?id=328f307298d62f81bb2eb355b0fc61ce7a86e346&amp;follow=1'>Update awesome theme</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-27 00:46:09 -0400'>2013-04-27</span></td><td><a href='/src/commit/.config/xfce4/terminal/terminalrc?id=e956adb2e172f3615667ca79b91ff76dbf7ec100&amp;follow=1'>Update terminal colors with proper base16 palette</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-27 00:26:43 -0400'>2013-04-27</span></td><td><a href='/src/commit/.config/xfce4/terminal/terminalrc?id=422765986a5fde204a10dcccfd55f4c564f8e501&amp;follow=1'>Update location of Xfce4-Terminal configuration</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-24 13:57:02 -0400'>2013-04-24</span></td><td><a href='/src/commit/etc/pulse/default.pa?id=21838519e2109d9c16b0edf165c2f727467a6402&amp;follow=1'>Update system configurations</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-23 17:42:22 -0400'>2013-04-23</span></td><td><a href='/src/commit/.config/Terminal/terminalrc?id=481eea852a7006b07799bd162056d884b3929174&amp;follow=1'>Fix terminal colors</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-14 21:19:10 -0400'>2013-04-14</span></td><td><a href='/src/commit/.xinitrc?id=a79090e5a201bdfca6c399d588e991705f4f5a7a&amp;follow=1'>Start xcompmgr</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-06 12:50:22 -0400'>2013-04-06</span></td><td><a href='/src/commit/.zshrc?id=52a4f2437229b19e8c8eb2be7c191621fc4d413c&amp;follow=1'>Drop pacman-color, regular pacman now has color</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-04-06 11:09:26 -0400'>2013-04-06</span></td><td><a href='/src/commit/.xinitrc?id=48a9014aa1051ee925547fc056cca35ee192980c&amp;follow=1'>Restore wallpaper automatically</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-03-22 00:09:16 -0400'>2013-03-22</span></td><td><a href='/src/commit/.xinitrc?id=30a83ab7355cf43df4a439cf0fe48aaef4bbbdc3&amp;follow=1'>Simplify autostart</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-02-24 22:52:35 -0500'>2013-02-24</span></td><td><a href='/src/commit/.zshrc?id=c5c9027cbd862c0dbf879a8baa4c21f83e31cc19&amp;follow=1'>Default to Ruby 2.0</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 19:44:24 -0500'>2013-01-26</span></td><td><a href='/src/commit/.riplrc?id=0a6b42fede014c926dd8106ad100414d5edcfdbc&amp;follow=1'>Make pretty riplrc</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 19:44:08 -0500'>2013-01-26</span></td><td><a href='/src/commit/.xinitrc?id=052ead286eacb76a4ad4bf897bd71e9a6c73dba3&amp;follow=1'>Default to awesome session</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 17:46:57 -0500'>2013-01-26</span></td><td><a href='/src/commit/.zshrc?id=7d9d17639e04d4e6adcb3a0289acffea40256474&amp;follow=1'>Add git prompt</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 16:46:11 -0500'>2013-01-26</span></td><td><a href='/src/commit/.config/awesome/rc.lua?id=0221206a4d9c098070467198139d790a1e3b338a&amp;follow=1'>Actually port awesome config to 3.5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 16:19:30 -0500'>2013-01-26</span></td><td><a href='/src/commit/.zshrc?id=1d95d62c05bdad199b052cdfec06483b51f051b6&amp;follow=1'>Make pretty zshrc</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 16:15:36 -0500'>2013-01-26</span></td><td><a href='/src/commit/.config/awesome/rc.lua?id=aabf06c4a2af2ae95a28a8aeb9a203a90d5ca52d&amp;follow=1'>Port awesome config to 3.5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2013-01-26 16:14:10 -0500'>2013-01-26</span></td><td><a href='/src/commit/.zshrc?id=eb24540cda4825bc24ec3d750d450535f1904fe1&amp;follow=1'>Replace RVM with chruby</a></td><td>June McEnroe