Skip to content

Commit f33f1ef

Browse files
flangletflanglet
committed
Add explicit casts
1 parent 58dc9e9 commit f33f1ef

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎src/Context.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace kanzi
3535
int64 lVal;
3636
std::string sVal;
3737

38-
ContextVal(bool b, uint64 val, const std::string& str) : isString(b), lVal(val), sVal(str) {}
38+
ContextVal(bool b, int64 val, const std::string& str) : isString(b), lVal(val), sVal(str) {}
3939
ContextVal() { isString = false; lVal = 0; }
4040
} ctxVal;
4141

‎src/Global.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void Global::computeHistogram(const byte block[], int length, uint freqs[], bool
170170

171171
if (isOrder0 == true) {
172172
if (withTotal == true)
173-
freqs[256] = length;
173+
freqs[256] = uint(length);
174174

175175
uint f0[256] = { 0 };
176176
uint f1[256] = { 0 };
@@ -302,7 +302,7 @@ int Global::computeFirstOrderEntropy1024(int blockLen, const uint histo[])
302302
return 0;
303303

304304
uint64 sum = 0;
305-
const int logLength1024 = Global::log2_1024(blockLen);
305+
const int logLength1024 = Global::log2_1024(uint32(blockLen));
306306

307307
for (int i = 0; i < 256; i++) {
308308
if (histo[i] == 0)

‎src/transform/AliasCodec.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool AliasCodec::forward(SliceArray<byte>& input, SliceArray<byte>& output, int
122122
// 4 symbols or less
123123
const int c3 = count & 3;
124124
dst[dstIdx++] = byte(c3);
125-
memcpy(&dst[dstIdx], &src[srcIdx], c3);
125+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(c3));
126126
srcIdx += c3;
127127
dstIdx += c3;
128128

@@ -268,7 +268,7 @@ bool AliasCodec::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int
268268
if ((oSize < 0) || (output._index + oSize > output._length))
269269
return false;
270270

271-
memset(&dst[0], int(val), oSize);
271+
memset(&dst[0], int(val), size_t(oSize));
272272
srcIdx = count;
273273
dstIdx = oSize;
274274
}
@@ -300,7 +300,7 @@ bool AliasCodec::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int
300300
decodeMap[i] = val;
301301
}
302302

303-
memcpy(&dst[dstIdx], &src[srcIdx], adjust);
303+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(adjust));
304304
srcIdx += adjust;
305305
dstIdx += adjust;
306306

‎src/transform/AliasCodec.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace kanzi {
3030

3131
friend bool operator< (ssAlias const& lhs, ssAlias const& rhs) {
3232
int r;
33-
return ((r = lhs.freq - rhs.freq) != 0) ? r > 0 : lhs.val > rhs.val;
33+
return ((r = int(lhs.freq - rhs.freq)) != 0) ? r > 0 : lhs.val > rhs.val;
3434
}
3535
} sdAlias;
3636

‎src/transform/EXECodec.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ bool EXECodec::forwardX86(SliceArray<byte>& input, SliceArray<byte>& output, int
125125
return false;
126126

127127
if (codeStart > 0) {
128-
memcpy(&dst[dstIdx], &src[0], codeStart);
128+
memcpy(&dst[dstIdx], &src[0], size_t(codeStart));
129129
dstIdx += codeStart;
130130
}
131131

@@ -177,7 +177,7 @@ bool EXECodec::forwardX86(SliceArray<byte>& input, SliceArray<byte>& output, int
177177

178178
LittleEndian::writeInt32(&dst[1], codeStart);
179179
LittleEndian::writeInt32(&dst[5], dstIdx);
180-
memcpy(&dst[dstIdx], &src[srcIdx], count - srcIdx);
180+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(count - srcIdx));
181181
dstIdx += (count - srcIdx);
182182

183183
// Cap expansion due to false positives
@@ -206,7 +206,7 @@ bool EXECodec::forwardARM(SliceArray<byte>& input, SliceArray<byte>& output, int
206206
return false;
207207

208208
if (codeStart > 0) {
209-
memcpy(&dst[dstIdx], &src[0], codeStart);
209+
memcpy(&dst[dstIdx], &src[0], size_t(codeStart));
210210
dstIdx += codeStart;
211211
}
212212

@@ -273,7 +273,7 @@ bool EXECodec::forwardARM(SliceArray<byte>& input, SliceArray<byte>& output, int
273273

274274
LittleEndian::writeInt32(&dst[1], codeStart);
275275
LittleEndian::writeInt32(&dst[5], dstIdx);
276-
memcpy(&dst[dstIdx], &src[srcIdx], count - srcIdx);
276+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(count - srcIdx));
277277
dstIdx += (count - srcIdx);
278278

279279
// Cap expansion due to false positives
@@ -321,7 +321,7 @@ bool EXECodec::inverseX86(SliceArray<byte>& input, SliceArray<byte>& output, int
321321
return false;
322322

323323
if (codeStart > 0) {
324-
memcpy(&dst[dstIdx], &src[srcIdx], codeStart);
324+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(codeStart));
325325
dstIdx += codeStart;
326326
srcIdx += codeStart;
327327
}
@@ -357,7 +357,7 @@ bool EXECodec::inverseX86(SliceArray<byte>& input, SliceArray<byte>& output, int
357357
}
358358

359359
if (srcIdx < count) {
360-
memcpy(&dst[dstIdx], &src[srcIdx], count - srcIdx);
360+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(count - srcIdx));
361361
dstIdx += (count - srcIdx);
362362
}
363363

@@ -380,7 +380,7 @@ bool EXECodec::inverseARM(SliceArray<byte>& input, SliceArray<byte>& output, int
380380
return false;
381381

382382
if (codeStart > 0) {
383-
memcpy(&dst[dstIdx], &src[srcIdx], codeStart);
383+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(codeStart));
384384
dstIdx += codeStart;
385385
srcIdx += codeStart;
386386
}
@@ -426,7 +426,7 @@ bool EXECodec::inverseARM(SliceArray<byte>& input, SliceArray<byte>& output, int
426426
}
427427

428428
if (srcIdx < count) {
429-
memcpy(&dst[dstIdx], &src[srcIdx], count - srcIdx);
429+
memcpy(&dst[dstIdx], &src[srcIdx], size_t(count - srcIdx));
430430
dstIdx += (count - srcIdx);
431431
}
432432

‎src/transform/FSDCodec.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ bool FSDCodec::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int co
305305
return false;
306306

307307
// Emit first bytes
308-
memcpy(&dst[0], &src[2], dist);
308+
memcpy(&dst[0], &src[2], size_t(dist));
309309
int srcIdx = dist + 2;
310310
int dstIdx = dist;
311311

‎src/transform/NullTransform.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace kanzi
5959
if (output._index + length > output._length)
6060
return false;
6161

62-
memcpy(&output._array[output._index], &input._array[input._index], length);
62+
memcpy(&output._array[output._index], &input._array[input._index], size_t(length));
6363
input._index += length;
6464
output._index += length;
6565
return true;

‎src/transform/ROLZCodec.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ bool ROLZCodec1::forward(SliceArray<byte>& input, SliceArray<byte>& output, int
314314
if (litLen >= 31)
315315
lenBuf._index += emitLength(&lenBuf._array[lenBuf._index], litLen - 31);
316316

317-
memcpy(&litBuf._array[litBuf._index], &buf[firstLitIdx], litLen);
317+
memcpy(&litBuf._array[litBuf._index], &buf[firstLitIdx], size_t(litLen));
318318
litBuf._index += litLen;
319319
}
320320

@@ -338,7 +338,7 @@ bool ROLZCodec1::forward(SliceArray<byte>& input, SliceArray<byte>& output, int
338338
if (litLen >= 31)
339339
lenBuf._index += emitLength(&lenBuf._array[lenBuf._index], litLen - 31);
340340

341-
memcpy(&litBuf._array[litBuf._index], &buf[firstLitIdx], litLen);
341+
memcpy(&litBuf._array[litBuf._index], &buf[firstLitIdx], size_t(litLen));
342342
litBuf._index += litLen;
343343

344344
try {
@@ -514,7 +514,7 @@ bool ROLZCodec1::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int
514514

515515
if (onlyLiterals == true) {
516516
// Shortcut when no match
517-
memcpy(&output._array[output._index], &litBuf._array[0], sizeChunk);
517+
memcpy(&output._array[output._index], &litBuf._array[0], size_t(sizeChunk));
518518
startChunk = endChunk;
519519
output._index += sizeChunk;
520520
continue;
@@ -547,7 +547,7 @@ bool ROLZCodec1::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int
547547
goto End;
548548
}
549549

550-
memcpy(&buf[dstIdx], &litBuf._array[litBuf._index], litLen);
550+
memcpy(&buf[dstIdx], &litBuf._array[litBuf._index], size_t(litLen));
551551
int srcInc = 0;
552552

553553
if (cond == true) {

‎src/transform/SRT.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ bool SRT::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int length)
162162
if (r == 0)
163163
continue;
164164

165-
memmove(&r2s[0], &r2s[1], r);
165+
memmove(&r2s[0], &r2s[1], size_t(r));
166166
r2s[r] = c;
167167
c = r2s[0];
168168
}
@@ -171,7 +171,7 @@ bool SRT::inverse(SliceArray<byte>& input, SliceArray<byte>& output, int length)
171171
continue;
172172

173173
nbSymbols--;
174-
memmove(&r2s[0], &r2s[1], nbSymbols);
174+
memmove(&r2s[0], &r2s[1], size_t(nbSymbols));
175175
c = r2s[0];
176176
}
177177
}

‎src/transform/TransformSequence.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ namespace kanzi {
143143
if ((output._index + count > output._length) || (in->_index + count > in->_length))
144144
_skipFlags = SKIP_MASK;
145145
else
146-
std::memcpy(&output._array[output._index], &in->_array[in->_index], count);
146+
std::memcpy(&output._array[output._index], &in->_array[in->_index], size_t(count));
147147
}
148148

149149
input._index += blockSize;
@@ -167,7 +167,7 @@ namespace kanzi {
167167
return true;
168168

169169
if (_skipFlags == SKIP_MASK) {
170-
std::memcpy(&output._array[output._index], &input._array[input._index], count);
170+
std::memcpy(&output._array[output._index], &input._array[input._index], size_t(count));
171171
input._index += count;
172172
output._index += count;
173173
return true;
@@ -215,7 +215,7 @@ namespace kanzi {
215215
if ((output._index + count > output._length) || (input._index + count > input._length))
216216
res = false;
217217
else
218-
std::memcpy(&output._array[output._index], &input._array[input._index], count);
218+
std::memcpy(&output._array[output._index], &input._array[input._index], size_t(count));
219219
}
220220

221221
input._index += blockSize;

0 commit comments

Comments
 (0)