From: Axel R. <ro...@us...> - 2014-09-26 13:41:13
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10769 Modified Files: sdif_matrix.hpp Log Message: Fixed reading single character labels. Index: sdif_matrix.hpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sdif_matrix.hpp 24 Sep 2014 15:20:15 -0000 1.13 --- sdif_matrix.hpp 26 Sep 2014 13:41:09 -0000 1.14 *************** *** 37,40 **** --- 37,43 ---- * * $Log$ + * Revision 1.14 2014/09/26 13:41:09 roebel + * Fixed reading single character labels. + * * 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. *************** *** 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))); } --- 625,634 ---- // garcefully handle errors where text is stored as a row and not as a column. ! if(GetNbCols() == 1) for(int ii=0;ii<GetNbRows();++ii) ! value.append(1,static_cast<char>(GetInt(ii, 0))); ! else if(GetNbRows() == 1) for(int ii=0;ii<GetNbCols();++ii) ! value.append(1,static_cast<char>(GetInt(0, ii))); } |