<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10720">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array<br><br>Fixes this type of compilation warning:<br>‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class Complex<float>’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess]<br><br>Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054<br>---<br>M Transceiver52M/radioInterfaceMulti.cpp<br>1 file changed, 16 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>index 67ccb25..17a015b 100644</span><br><span>--- a/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>+++ b/Transceiver52M/radioInterfaceMulti.cpp</span><br><span>@@ -230,6 +230,7 @@</span><br><span> bool local_underrun;</span><br><span> size_t num;</span><br><span> float *buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span> </span><br><span> if (recvBuffer[0]->getFreeSegments() <= 0)</span><br><span> return -1;</span><br><span>@@ -273,10 +274,22 @@</span><br><span> buf = channelizer->outputBuffer(pchan);</span><br><span> size_t cLen = channelizer->outputLen();</span><br><span> size_t hLen = dnsampler->len();</span><br><span style="color: hsl(0, 100%, 40%);">- size_t hSize = 2 * hLen * sizeof(float);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&buf[2 * -hLen], history[lchan]->begin(), hSize);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(history[lchan]->begin(), &buf[2 * (cLen - hLen)], hSize);</span><br><span style="color: hsl(120, 100%, 40%);">+ float *fdst = &buf[2 * -hLen];</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *src = history[lchan]->begin();</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < hLen; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fdst[0] = src->real();</span><br><span style="color: hsl(120, 100%, 40%);">+ fdst[1] = src->imag();</span><br><span style="color: hsl(120, 100%, 40%);">+ src++;</span><br><span style="color: hsl(120, 100%, 40%);">+ fdst += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *dst = history[lchan]->begin();</span><br><span style="color: hsl(120, 100%, 40%);">+ float *fsrc = &buf[2 * (cLen - hLen)];</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < hLen; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = complex(fdst[0], fdst[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ fsrc += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ dst++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> float *wr_segment = recvBuffer[lchan]->getWriteSegment();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10720">change 10720</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10720"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 </div>
<div style="display:none"> Gerrit-Change-Number: 10720 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>