forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from allen-garvey/master 

Fix compiler errors in jpeg.d
This commit is contained in:
Adam D. Ruppe 2017-02-09 22:10:50 -05:00 committed by GitHub
parent 5e7b6a75e1 852d3cf933
commit 67ede2e6d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jpeg.d
View File

@ -1023,7 +1023,7 @@ private:
} }
if (!rv) 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); mem_block *b = cast(mem_block*)jpgd_malloc(mem_block.sizeof + capacity);
if (!b) { stop_decoding(JPGD_NOTENOUGHMEM); } if (!b) { stop_decoding(JPGD_NOTENOUGHMEM); }
b.m_pNext = m_pMem_blocks; m_pMem_blocks = b; b.m_pNext = m_pMem_blocks; m_pMem_blocks = b;
@ -2591,7 +2591,7 @@ private:
cb.block_num_y = block_num_y; cb.block_num_y = block_num_y;
cb.block_len_x = block_len_x; cb.block_len_x = block_len_x;
cb.block_len_y = block_len_y; 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); cb.pData = cast(ubyte*)alloc(cb.block_size * block_num_x * block_num_y, true);
return cb; return cb;
} }