potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests

Browse Source 
# Conflicts:
#	modules/core/test/test_io.cpp
This commit is contained in:
MYLS
2016-07-30 01:08:27 +08:00
parent 08911cbfae f2e9588c93
commit 3935855365
196 changed files with 5398 additions and 1448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence.cpp
-2
View File
@@ -4234,8 +4234,6 @@ icvReadMat( CvFileStorage* fs, CvFileNode* node )
mat = cvCreateMat( rows, cols, elem_type );
cvReadRawData( fs, data, mat->data.ptr, dt );
}
else if( rows == 0 && cols == 0 )
mat = cvCreateMatHeader( 0, 1, elem_type );
else
mat = cvCreateMatHeader( rows, cols, elem_type );