[Sdif-cvs] Easdif/easdif sdif_matrix.cpp,1.2,1.3

[Axel R. <ro...@us...>]

Update of /cvsroot/sdif/Easdif/easdif
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2212/easdif

Modified Files:
	sdif_matrix.cpp 
Log Message:
Matrix reading routine returns bytecount read for selected matrices only.


Index: sdif_matrix.cpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sdif_matrix.cpp	22 Apr 2006 11:48:09 -0000	1.2
--- sdif_matrix.cpp	30 Apr 2007 11:32:18 -0000	1.3
***************
*** 36,39 ****
--- 36,42 ----
   * 
   * $Log$
+  * Revision 1.3  2007/04/30 11:32:18  roebel
+  * Matrix reading routine returns bytecount read for selected matrices only.
+  *
   * Revision 1.2  2006/04/22 11:48:09  roebel
   * Fixed left over problems from last renameing operation.
***************
*** 333,338 ****
    mFile = file;
  
    bytesread = 0;
-   bytesread += SdifFReadMatrixHeader(file);
    /* for selection */
    
--- 336,341 ----
    mFile = file;
  
+   int bytesreadheader = SdifFReadMatrixHeader(file);
    bytesread = 0;
    /* for selection */
    
***************
*** 359,363 ****
      Init(mSig, nrows, ncols, SdifFCurrDataType (file));
      /* add bytesread */
!     bytesread += mInter->read(file);
      return bytesread;
  }
--- 362,366 ----
      Init(mSig, nrows, ncols, SdifFCurrDataType (file));
      /* add bytesread */
!     bytesread = mInter->read(file)+bytesreadheader;
      return bytesread;
  }