Merged the trunk r8547:8574, r8587

This commit is contained in:
Andrey Kamaev
2012-06-15 08:36:35 +00:00
parent 4b1724aeb9
commit ab20da0f53
12 changed files with 133 additions and 33 deletions

View File

@@ -1132,7 +1132,7 @@ CvBoost::update_weights( CvBoostTree* tree )
else
{
if( have_subsample )
_buf_size += data->buf->step*(sizeof(float)+sizeof(uchar));
_buf_size += data->buf->cols*(sizeof(float)+sizeof(uchar));
}
inn_buf.allocate(_buf_size);
uchar* cur_buf_pos = (uchar*)inn_buf;