From a540039d76ba0d263cf06ed943a8e284feaac233 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 28 Feb 2018 20:44:02 -0500
Subject: Use memmove in pngo where needed

---
 bin/pngo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/pngo.c b/bin/pngo.c
index 80721547..d783fa73 100644
--- a/bin/pngo.c
+++ b/bin/pngo.c
@@ -455,7 +455,7 @@ static void discardAlpha(void) {
     for (uint32_t y = 0; y < header.height; ++y) {
         *ptr++ = lines[y]->type;
         for (uint32_t x = 0; x < header.width; ++x) {
-            memcpy(ptr, &lines[y]->data[x * pixelSize], colorSize);
+            memmove(ptr, &lines[y]->data[x * pixelSize], colorSize);
             ptr += colorSize;
         }
     }
@@ -482,10 +482,10 @@ static void discardColor(void) {
         *ptr++ = lines[y]->type;
         for (uint32_t x = 0; x < header.width; ++x) {
             uint8_t *pixel = &lines[y]->data[x * pixelSize];
-            memcpy(ptr, pixel, sampleSize);
+            memmove(ptr, pixel, sampleSize);
             ptr += sampleSize;
             if (header.color == TRUECOLOR_ALPHA) {
-                memcpy(ptr, pixel + 3 * sampleSize, sampleSize);
+                memmove(ptr, pixel + 3 * sampleSize, sampleSize);
                 ptr += sampleSize;
             }
         }
-- 
cgit 1.4.1

c/diff/port?id=bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/port'>
<input type='hidden' name='id' value='bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8'/><input type='hidden' name='showmsg' value='1'/><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=bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/port?id=bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8&amp;showmsg=1&amp;follow=1'>port</a> (<a href='/src/log/port?id=bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/port?id=bb9a412a8c9736dc52fe9a7aee997ae5a6c582d8&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-05-09 22:37:41 -0400'>2019-05-09</span></td><td class='logsubject'><a href='/src/commit/txt/books.txt?id=0b94d9fd6c9a2e8c59ef7fd88d2b1c78b5211e87&amp;follow=1'>Add Parable of the Sower</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-05-07 22:40:21 -0400'>2019-05-07</span></td><td class='logsubject'><a href='/src/commit/bin/bitlex.l?id=f4b7d09ddb35f014dc12e10ce4ed9f36fb67550a&amp;follow=1'>Add bit without build</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Need to do some stuff in the Makefile for lex and yacc and generating
HTML pages for it.


</td></tr>
<tr class='logheader'><td><span title='2019-05-04 17:58:11 -0400'>2019-05-04</span></td><td class='logsubject'><a href='/src/commit/bin/Makefile?id=7f312726e016fbfcd0725c5b9feb625503ec5f67&amp;follow=1'>Fix MANDIR typo</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2019-05-04 17:50:38 -0400'>2019-05-04</span></td><td class='logsubject'><a href='/src/commit/bin/relay.c?id=b6d2f4a5ab6089cbcf8f2e1de40d292baa5b3a83&amp;follow=1'>Move relay to bin</a></td><td>June McEnroe