fix 2d array transpose issue, close #54

Author: fangq

jdatadecode.m

@@ -101,64 +101,46 @@
             end
         else
             if(iscell(data(j).(N_('_ArrayData_'))))
-                data(j).(N_('_ArrayData_'))=cell2mat(cellfun(@(x) double(x(:)),data(j).(N_('_ArrayData_')),'uniformoutput',0));
+                data(j).(N_('_ArrayData_'))=cell2mat(cellfun(@(x) double(x(:)),data(j).(N_('_ArrayData_')),'uniformoutput',0)).';
             end
             ndata=cast(data(j).(N_('_ArrayData_')),data(j).(N_('_ArrayType_')));
         end
         iscpx=0;
-        needtranspose=0;
         if(~isempty(strmatch(N_('_ArrayIsComplex_'),fn)))
             if(data(j).(N_('_ArrayIsComplex_')))
                iscpx=1;
-               needtranspose=islogical(data(j).(N_('_ArrayIsComplex_')));
             end
         end
         if(~isempty(strmatch(N_('_ArrayIsSparse_'),fn)) && data(j).(N_('_ArrayIsSparse_')))
                 if(islogical(data(j).(N_('_ArrayIsSparse_'))))
-                    needtranspose=1;
                 end
                 if(~isempty(strmatch(N_('_ArraySize_'),fn)))
                     dim=double(data(j).(N_('_ArraySize_'))(:)');
-                    if(iscpx && size(ndata,2)==4-any(dim==1))
-                        ndata(:,end-1)=complex(ndata(:,end-1),ndata(:,end));
+                    if(iscpx)
+                        ndata(end-1,:)=complex(ndata(end-1,:),ndata(end,:));
                     end
                     if isempty(ndata)
                         % All-zeros sparse
                         ndata=sparse(dim(1),prod(dim(2:end)));
                     elseif dim(1)==1
                         % Sparse row vector
-                        if(size(ndata,2)~=2 && size(ndata,1)==2) 
-                            ndata=ndata';
-                        end
-                        ndata=sparse(1,ndata(:,1),ndata(:,2),dim(1),prod(dim(2:end)));
+                        ndata=sparse(1,ndata(1,:),ndata(2,:),dim(1),prod(dim(2:end)));
                     elseif dim(2)==1
                         % Sparse column vector
-                        if(size(ndata,2)~=2 && size(ndata,1)==2) 
-                            ndata=ndata';
-                        end
-                        ndata=sparse(ndata(:,1),1,ndata(:,2),dim(1),prod(dim(2:end)));
+                        ndata=sparse(ndata(1,:),1,ndata(2,:),dim(1),prod(dim(2:end)));
                     else
                         % Generic sparse array.
-                        if(size(ndata,2)~=3 && size(ndata,1)==3) 
-                            ndata=ndata';
-                        end
-                        ndata=sparse(ndata(:,1),ndata(:,2),ndata(:,3),dim(1),prod(dim(2:end)));
+                        ndata=sparse(ndata(1,:),ndata(2,:),ndata(3,:),dim(1),prod(dim(2:end)));
                     end
                 else
                     if(iscpx && size(ndata,2)==4)
-                        ndata(:,3)=complex(ndata(:,3),ndata(:,4));
+                        ndata(3,:)=complex(ndata(3,:),ndata(4,:));
                     end
-                    ndata=sparse(ndata(:,1),ndata(:,2),ndata(:,3));
+                    ndata=sparse(ndata(1,:),ndata(2,:),ndata(3,:));
                 end
         elseif(~isempty(strmatch(N_('_ArraySize_'),fn)))
-            if(needtranspose)
-                ndata=ndata';
-            end
             if(iscpx)
-                if(size(ndata,2)~=2 && size(ndata,1)==2)
-                    ndata=ndata';
-                end
-                ndata=complex(ndata(:,1),ndata(:,2));
+                ndata=complex(ndata(1,:),ndata(2,:));
             end
             if(format>1.9)
                 data(j).(N_('_ArraySize_'))=data(j).(N_('_ArraySize_'))(end:-1:1);

loadjson.m

@@ -165,7 +165,7 @@
                                 [obj, nextidx]=parse2darray(inputstr,pos+rowstart,arraystr);
                                 if(nextidx>=length(arraystr)-1)
                                     object=obj;
-                                    if(format>1.9 && ~isvector(object))
+                                    if(format>1.9)
                                         object=object.';
                                     end
                                     pos=endpos;
@@ -513,7 +513,7 @@
     astr=regexprep(deblank(astr),'\s+,',',');
     [obj, count, errmsg, nextidx]=sscanf(astr,'%f,',inf);
     if(nextidx>=length(astr)-1)
-            obj=reshape(obj,nextdim,numel(obj)/nextdim)';
+            obj=reshape(obj,nextdim,numel(obj)/nextdim);
             nextidx=length(arraystr)+1;
     end
 end

loadmsgpack.m

@@ -208,7 +208,7 @@
     if(true)
       try
         oldobj=out;
-        out=cell2mat(out');
+        out=cell2mat(out);
         if(iscell(oldobj) && isstruct(out) && numel(out)>1 && jsonopt('SimplifyCellArray',1,varargin{:})==0)
             out=oldobj;
         elseif(size(out,1)>1 && ismatrix(out))