sdr/sdrangelove
sdr
/
sdrangelove
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix c++11 narrowing complaints

This commit is contained in:
Eric Wild 2020-08-02 21:26:25 +02:00
parent fcc6956cbd
commit 22b488477b
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
include-gpl/dsp/inthalfbandfilter.h
View File

@ -12,6 +12,7 @@
*/
#define HB_FILTERORDER 32
#define HB_SHIFT 14
#define DTOFN(x) static_cast<qint32>(x)
class SDRANGELOVE_API IntHalfbandFilter {
public:
@ -234,48 +235,48 @@ protected:
#if HB_FILTERORDER == 64
static const qint32 COEFF[16] = {
-0.001114417441601693505720538368564120901 * (1 << HB_SHIFT),
0.001268007827185253051302527005361753254 * (1 << HB_SHIFT),
-0.001959831378850490895410230152151598304 * (1 << HB_SHIFT),
0.002878308307661380308073439948657323839 * (1 << HB_SHIFT),
-0.004071361818258721100571850826099762344 * (1 << HB_SHIFT),
0.005597288494657440618973431867289036745 * (1 << HB_SHIFT),
-0.007532345003308904551886371336877346039 * (1 << HB_SHIFT),
0.009980346844667375288961963519795972388 * (1 << HB_SHIFT),
-0.013092614174300500062830820979797863401 * (1 << HB_SHIFT),
0.01710934914871829748417297878404497169 * (1 << HB_SHIFT),
-0.022443558692997273018576720460259821266 * (1 << HB_SHIFT),
0.029875811511593811098386197500076377764 * (1 << HB_SHIFT),
-0.041086352085710403647667021687084343284 * (1 << HB_SHIFT),
0.060465467462665789533104998554335907102 * (1 << HB_SHIFT),
-0.104159517495977321788203084906854201108 * (1 << HB_SHIFT),
0.317657589850154464805598308885237202048 * (1 << HB_SHIFT),
DTOFN(-0.001114417441601693505720538368564120901 * (1 << HB_SHIFT)),
DTOFN( 0.001268007827185253051302527005361753254 * (1 << HB_SHIFT)),
DTOFN(-0.001959831378850490895410230152151598304 * (1 << HB_SHIFT)),
DTOFN( 0.002878308307661380308073439948657323839 * (1 << HB_SHIFT)),
DTOFN(-0.004071361818258721100571850826099762344 * (1 << HB_SHIFT)),
DTOFN( 0.005597288494657440618973431867289036745 * (1 << HB_SHIFT)),
DTOFN(-0.007532345003308904551886371336877346039 * (1 << HB_SHIFT)),
DTOFN( 0.009980346844667375288961963519795972388 * (1 << HB_SHIFT)),
DTOFN(-0.013092614174300500062830820979797863401 * (1 << HB_SHIFT)),
DTOFN( 0.01710934914871829748417297878404497169 * (1 << HB_SHIFT)),
DTOFN(-0.022443558692997273018576720460259821266 * (1 << HB_SHIFT)),
DTOFN( 0.029875811511593811098386197500076377764 * (1 << HB_SHIFT)),
DTOFN(-0.041086352085710403647667021687084343284 * (1 << HB_SHIFT)),
DTOFN( 0.060465467462665789533104998554335907102 * (1 << HB_SHIFT)),
DTOFN(-0.104159517495977321788203084906854201108 * (1 << HB_SHIFT)),
DTOFN( 0.317657589850154464805598308885237202048 * (1 << HB_SHIFT)),
};
#elif HB_FILTERORDER == 48
static const qint32 COEFF[12] = {
-0.004102576237611492253332112767338912818 * (1 << HB_SHIFT),
0.003950551047979387886410762575906119309 * (1 << HB_SHIFT),
-0.005807875789391703583164350277456833282 * (1 << HB_SHIFT),
0.00823497890520805998770814682075069868 * (1 << HB_SHIFT),
-0.011372226513199541059195851744334504474 * (1 << HB_SHIFT),
0.015471557140973646315984524335362948477 * (1 << HB_SHIFT),
-0.020944996398689276484450516591095947661 * (1 << HB_SHIFT),
0.028568078132034283034279553703527199104 * (1 << HB_SHIFT),
-0.040015143905614086738964374490024056286 * (1 << HB_SHIFT),
0.059669519431831075095828964549582451582 * (1 << HB_SHIFT),
-0.103669138691865420076609893840213771909 * (1 << HB_SHIFT),
0.317491986549921390015072120149852707982 * (1 << HB_SHIFT)
DTOFN(-0.004102576237611492253332112767338912818 * (1 << HB_SHIFT)),
DTOFN(0.003950551047979387886410762575906119309 * (1 << HB_SHIFT)),
DTOFN(-0.005807875789391703583164350277456833282 * (1 << HB_SHIFT)),
DTOFN(0.00823497890520805998770814682075069868 * (1 << HB_SHIFT)),
DTOFN(-0.011372226513199541059195851744334504474 * (1 << HB_SHIFT)),
DTOFN(0.015471557140973646315984524335362948477 * (1 << HB_SHIFT)),
DTOFN(-0.020944996398689276484450516591095947661 * (1 << HB_SHIFT)),
DTOFN(0.028568078132034283034279553703527199104 * (1 << HB_SHIFT)),
DTOFN(-0.040015143905614086738964374490024056286 * (1 << HB_SHIFT)),
DTOFN(0.059669519431831075095828964549582451582 * (1 << HB_SHIFT)),
DTOFN(-0.103669138691865420076609893840213771909 * (1 << HB_SHIFT)),
DTOFN(0.317491986549921390015072120149852707982 * (1 << HB_SHIFT))
};
#elif HB_FILTERORDER == 32
static const qint32 COEFF[8] = {
-0.015956912844043127236437484839370881673 * (1 << HB_SHIFT),
0.013023031678944928940522274274371739011 * (1 << HB_SHIFT),
-0.01866942273717486777684371190844103694 * (1 << HB_SHIFT),
0.026550887571157304190005987720724078827 * (1 << HB_SHIFT),
-0.038350314277854319344740474662103224546 * (1 << HB_SHIFT),
0.058429248652825838128421764849917963147 * (1 << HB_SHIFT),
-0.102889802028955756885153505209018476307 * (1 << HB_SHIFT),
0.317237706405931241260276465254719369113 * (1 << HB_SHIFT)
DTOFN(-0.015956912844043127236437484839370881673 * (1 << HB_SHIFT)),
DTOFN(0.013023031678944928940522274274371739011 * (1 << HB_SHIFT)),
DTOFN(-0.01866942273717486777684371190844103694 * (1 << HB_SHIFT)),
DTOFN(0.026550887571157304190005987720724078827 * (1 << HB_SHIFT)),
DTOFN(-0.038350314277854319344740474662103224546 * (1 << HB_SHIFT)),
DTOFN(0.058429248652825838128421764849917963147 * (1 << HB_SHIFT)),
DTOFN(-0.102889802028955756885153505209018476307 * (1 << HB_SHIFT)),
DTOFN(0.317237706405931241260276465254719369113 * (1 << HB_SHIFT))
};
#else
#error unsupported filter order

2
sdrbase/util/miniz.cpp
View File

@ -2779,7 +2779,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
*pLen_out = out_buf.m_size-41;
{
mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,"\0\0\04\02\06"[num_chans],0,0,0,0,0,0,0,
0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,static_cast<mz_uint8>("\0\0\04\02\06"[num_chans]),0,0,0,0,0,0,0,
(mz_uint8)(*pLen_out>>24),(mz_uint8)(*pLen_out>>16),(mz_uint8)(*pLen_out>>8),(mz_uint8)*pLen_out,0x49,0x44,0x41,0x54};
c=(mz_uint32)mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((mz_uint8*)(pnghdr+29))[i]=(mz_uint8)(c>>24);
memcpy(out_buf.m_pBuf, pnghdr, 41);