Fix destream -Wconversion warnings.

Bug: 21161908
Change-Id: I6d43490a26294dea4ee5c6dd4c155c291b6cadf2

diff --git a/framework/delibs/destream/deRingbuffer.c b/framework/delibs/destream/deRingbuffer.c
index 4e55139..7468484 100644 (file)
--- a/framework/delibs/destream/deRingbuffer.c
+++ b/framework/delibs/destream/deRingbuffer.c
@@ -59,8 +59,8 @@ deRingbuffer* deRingbuffer_create (deInt32 blockSize, deInt32 blockCount)
 
        ringbuffer->blockSize   = blockSize;
        ringbuffer->blockCount  = blockCount;
-       ringbuffer->buffer              = (deUint8*)deMalloc(sizeof(deUint8) * blockSize * blockCount);
-       ringbuffer->blockUsage  = (deInt32*)deMalloc(sizeof(deUint32) * blockCount);
+       ringbuffer->buffer              = (deUint8*)deMalloc(sizeof(deUint8) * (size_t)blockSize * (size_t)blockCount);
+       ringbuffer->blockUsage  = (deInt32*)deMalloc(sizeof(deUint32) * (size_t)blockCount);
        ringbuffer->emptyCount  = deSemaphore_create(ringbuffer->blockCount, DE_NULL);
        ringbuffer->fullCount   = deSemaphore_create(0, DE_NULL);
 
@@ -79,7 +79,7 @@ deRingbuffer* deRingbuffer_create (deInt32 blockSize, deInt32 blockCount)
                return DE_NULL;
        }
 
-       memset(ringbuffer->blockUsage, 0, sizeof(deInt32) * blockCount);
+       memset(ringbuffer->blockUsage, 0, sizeof(deInt32) * (size_t)blockCount);
 
        ringbuffer->outBlock    = 0;
        ringbuffer->outPos              = 0;
@@ -141,7 +141,7 @@ static deStreamResult producerStream_write (deStreamData* stream, const void* bu
                dst                     = ringbuffer->buffer + ringbuffer->blockSize * ringbuffer->inBlock + ringbuffer->inPos;
                src                     = (deUint8*)buf + *written;
 
-               deMemcpy(dst, src, writeSize);
+               deMemcpy(dst, src, (size_t)writeSize);
 
                ringbuffer->inPos += writeSize;
                *written += writeSize;
@@ -238,7 +238,7 @@ static deStreamResult consumerStream_read (deStreamData* stream, void* buf, deIn
                src                     = ringbuffer->buffer + ringbuffer->blockSize * ringbuffer->outBlock + ringbuffer->outPos;
                dst                     = (deUint8*)buf + *read;
 
-               deMemcpy(dst, src, writeSize);
+               deMemcpy(dst, src, (size_t)writeSize);
 
                ringbuffer->outPos += writeSize;
                *read += writeSize;

diff --git a/framework/delibs/destream/deStreamCpyThread.c b/framework/delibs/destream/deStreamCpyThread.c
index 97a0d9a..c07266a 100644 (file)
--- a/framework/delibs/destream/deStreamCpyThread.c
+++ b/framework/delibs/destream/deStreamCpyThread.c
@@ -28,7 +28,7 @@
 void cpyStream (void* arg)
 {
        deStreamCpyThread* thread = (deStreamCpyThread*)arg;
-       deUint8* buffer = malloc(sizeof(deUint8) * thread->bufferSize);
+       deUint8* buffer = malloc(sizeof(deUint8) * (size_t)thread->bufferSize);
 
        for(;;)
        {

diff --git a/framework/delibs/destream/deThreadStream.c b/framework/delibs/destream/deThreadStream.c
index 2cc0bf3..3c5ad98 100644 (file)
--- a/framework/delibs/destream/deThreadStream.c
+++ b/framework/delibs/destream/deThreadStream.c
@@ -48,7 +48,7 @@ static void inStreamCopy (void* arg)
 {
        deThreadInStream* threadStream = (deThreadInStream*)arg;
 
-       deUint8* buffer = malloc(sizeof(deUint8) * threadStream->bufferSize);
+       deUint8* buffer = malloc(sizeof(deUint8) * (size_t)threadStream->bufferSize);
 
        for(;;)
        {