Skip to content
Snippets Groups Projects
Commit b1ae5fa9 authored by Qianqian Fang's avatar Qianqian Fang
Browse files

fix #73 as a regression to #22

parent 0a393469
No related branches found
No related tags found
No related merge requests found
...@@ -114,7 +114,7 @@ function data = loadjson(fname,varargin) ...@@ -114,7 +114,7 @@ function data = loadjson(fname,varargin)
opt.arraytoken_=arraytoken; opt.arraytoken_=arraytoken;
opt.arraytokenidx_=arraytokenidx; opt.arraytokenidx_=arraytokenidx;
opt.simplifycell=jsonopt('SimplifyCell',1,opt); opt.simplifycell=jsonopt('SimplifyCell',1,opt);
opt.simplifycellarray=jsonopt('SimplifyCellArray',0,opt); opt.simplifycellarray=jsonopt('SimplifyCellArray',opt.simplifycell,opt);
opt.formatversion=jsonopt('FormatVersion',2,opt); opt.formatversion=jsonopt('FormatVersion',2,opt);
opt.fastarrayparser=jsonopt('FastArrayParser',1,opt); opt.fastarrayparser=jsonopt('FastArrayParser',1,opt);
opt.parsestringarray=jsonopt('ParseStringArray',0,opt); opt.parsestringarray=jsonopt('ParseStringArray',0,opt);
...@@ -281,7 +281,7 @@ function [object, pos,index_esc] = parse_array(inputstr, pos, esc, index_esc, va ...@@ -281,7 +281,7 @@ function [object, pos,index_esc] = parse_array(inputstr, pos, esc, index_esc, va
end end
if(varargin{1}.simplifycell) if(varargin{1}.simplifycell)
if(iscell(object) && ~isempty(object) && isnumeric(object{1})) if(iscell(object) && ~isempty(object) && (isnumeric(object{1}) || isstruct(object{1})) )
if(all(cellfun(@(e) isequal(size(object{1}), size(e)) , object(2:end)))) if(all(cellfun(@(e) isequal(size(object{1}), size(e)) , object(2:end))))
try try
oldobj=object; oldobj=object;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment