From: Axel R. <ro...@us...> - 2014-09-24 15:20:17
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15375 Modified Files: sdif_matrix.hpp Log Message: Fixed previous fix that did not use the GetInt function properly for strings stored in rows. Index: sdif_matrix.hpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** sdif_matrix.hpp 24 Sep 2014 14:09:19 -0000 1.12 --- sdif_matrix.hpp 24 Sep 2014 15:20:15 -0000 1.13 *************** *** 37,40 **** --- 37,43 ---- * * $Log$ + * Revision 1.13 2014/09/24 15:20:15 roebel + * Fixed previous fix that did not use the GetInt function properly for strings stored in rows. + * * Revision 1.12 2014/09/24 14:09:19 roebel * Fixed reading text stored i a column for text matrices. *************** *** 619,625 **** // garcefully handle errors where text is stored as a row and not as a column. ! for(int ii=0;ii<GetNbRows()*GetNbCols();++ii) ! value.append(1,static_cast<char>(GetInt(ii,0))); ! } --- 622,631 ---- // garcefully handle errors where text is stored as a row and not as a column. ! if(GetNbRows() > 1) ! for(int ii=0;ii<GetNbRows();++ii) ! value.append(1,static_cast<char>(GetInt(0,ii))); ! else if(GetNbCols() >1) ! for(int ii=0;ii<GetNbCols();++ii) ! value.append(1,static_cast<char>(GetInt(0,ii))); } |