generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-03-20 09:37:49 +00:00
parent 69344f175b 8755ffbf31
commit 226b4e3ed5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/datastructs.cpp
View File

@@ -645,7 +645,7 @@ icvGrowSeq( CvSeq *seq, int in_front_of )
/* If there is a free space just after last allocated block /* If there is a free space just after last allocated block
and it is big enough then enlarge the last block. and it is big enough then enlarge the last block.
This can happen only if the new block is added to the end of sequence: */ This can happen only if the new block is added to the end of sequence: */
if( (unsigned)(ICV_FREE_PTR(storage) - seq->block_max) < CV_STRUCT_ALIGN && if( (size_t)(ICV_FREE_PTR(storage) - seq->block_max) < CV_STRUCT_ALIGN &&
storage->free_space >= seq->elem_size && !in_front_of ) storage->free_space >= seq->elem_size && !in_front_of )
{ {
int delta = storage->free_space / elem_size; int delta = storage->free_space / elem_size;