From 72bd2ed6ee04890ca09383137804cf20bd20fadb Mon Sep 17 00:00:00 2001 From: Allen Garvey Date: Thu, 9 Feb 2017 20:44:53 -0500 Subject: [PATCH 1/2] Remove uneeded cast to int that causes compiler error --- jpeg.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpeg.d b/jpeg.d index 443ee13..37fc372 100644 --- a/jpeg.d +++ b/jpeg.d @@ -1023,7 +1023,7 @@ private: } if (!rv) { - int capacity = JPGD_MAX(32768 - 256, (nSize + 2047) & ~2047); + size_t capacity = JPGD_MAX(32768 - 256, (nSize + 2047) & ~2047); mem_block *b = cast(mem_block*)jpgd_malloc(mem_block.sizeof + capacity); if (!b) { stop_decoding(JPGD_NOTENOUGHMEM); } b.m_pNext = m_pMem_blocks; m_pMem_blocks = b; From 852d3cf9334b7a6f18a57385a34886e2de9a409f Mon Sep 17 00:00:00 2001 From: Allen Garvey Date: Thu, 9 Feb 2017 20:54:28 -0500 Subject: [PATCH 2/2] Add explicit cast from ulong to int to remove compiler error --- jpeg.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpeg.d b/jpeg.d index 37fc372..7561a7a 100644 --- a/jpeg.d +++ b/jpeg.d @@ -2591,7 +2591,7 @@ private: cb.block_num_y = block_num_y; cb.block_len_x = block_len_x; cb.block_len_y = block_len_y; - cb.block_size = (block_len_x * block_len_y) * jpgd_block_t.sizeof; + cb.block_size = cast(int)((block_len_x * block_len_y) * jpgd_block_t.sizeof); cb.pData = cast(ubyte*)alloc(cb.block_size * block_num_x * block_num_y, true); return cb; }