[Sdif-cvs] Easdif/easdif sdifentity.hpp,1.26,1.27

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

Update of /cvsroot/sdif/Easdif/easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv20346/easdif

Modified Files:
	sdifentity.hpp 
Log Message:
Renamed function arguments to avoid compiler warnings in swig python interface.
Enhanced documentation of ReadNextSelectedFrame()


Index: sdifentity.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifentity.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** sdifentity.hpp	10 Aug 2012 01:03:29 -0000	1.26
--- sdifentity.hpp	28 Aug 2012 22:02:39 -0000	1.27
***************
*** 36,39 ****
--- 36,43 ----
   * 
   * $Log$
+  * Revision 1.27  2012/08/28 22:02:39  roebel
+  * Renamed function arguments to avoid compiler warnings in swig python interface.
+  * Enhanced documentation of ReadNextSelectedFrame()
+  *
   * Revision 1.26  2012/08/10 01:03:29  roebel
   * Added new function that allows to retrieve easdif version during runtime.
***************
*** 807,823 ****
       * @return true if found
       */
!     bool  LocMatrixExists(SdifSignature in)     const { 
        int nn = mFrameHdr.NbMatrix;
        if(!nn)
          return false;
!       if(nn && mMatrixSig0 == in)
          return true;
!       if(nn>1 && mMatrixSig1 == in)
          return true;
!       if(nn>2 && mMatrixSig2 == in)
          return true;
        nn -= 2;
        while(--nn)
!         if(mMatrixN[nn] == in)
            return true;
        return false;
--- 811,827 ----
       * @return true if found
       */
!     bool  LocMatrixExists(SdifSignature inSig)     const { 
        int nn = mFrameHdr.NbMatrix;
        if(!nn)
          return false;
!       if(nn && mMatrixSig0 == inSig)
          return true;
!       if(nn>1 && mMatrixSig1 == inSig)
          return true;
!       if(nn>2 && mMatrixSig2 == inSig)
          return true;
        nn -= 2;
        while(--nn)
!         if(mMatrixN[nn] == inSig)
            return true;
        return false;
***************
*** 831,836 ****
       * @return true if found
       */
!     bool  LocMatrixExists(const std::string &in)     const { 
!       SdifSignature sig = SdifStringToSignature(const_cast<char*>(in.c_str()));
        return LocMatrixExists(sig);
      }
--- 835,840 ----
       * @return true if found
       */
!     bool  LocMatrixExists(const std::string &inStr)     const { 
!       SdifSignature sig = SdifStringToSignature(const_cast<char*>(inStr.c_str()));
        return LocMatrixExists(sig);
      }
***************
*** 1870,1878 ****
     *
     * read the next selected frame of the file
!    * return the number of bytes read
     * 
     * @param frame to fill
     * 
     * @return  number of data bytes read for selected matrices 
     */
    int ReadNextSelectedFrame(SDIFFrame& frame);
--- 1874,1886 ----
     *
     * read the next selected frame of the file
!    * return the number of bytes read, sets eof if there is no next frame available
!    * and throws SDIFEof if called with file already being at eof(). Wil return 0 bytes read only if 
!    * the last frames in the file are not selected such that eof is reached before a selected frame
!    * can be read.
     * 
     * @param frame to fill
     * 
     * @return  number of data bytes read for selected matrices 
+    *
     */
    int ReadNextSelectedFrame(SDIFFrame& frame);
***************
*** 2403,2408 ****
          SdifFGetSignature(mpEnt->GetFile(), &SizeR);            
          if(SizeR!=sizeof(SdifSignature)){
            throw SDIFSeekError(eError,
!                               "Error in  SDIFEntity::FRIterator::GotoPos()!!!error while seeking  !!!",
                                0,eUnknown,__FILE__,__LINE__);
          }
--- 2411,2419 ----
          SdifFGetSignature(mpEnt->GetFile(), &SizeR);            
          if(SizeR!=sizeof(SdifSignature)){
+           char msg[512];
+           sprintf(msg,"Error in  SDIFEntity::FRIterator::GotoPos()!!!error while seeking to pos pos %ld !!!\n", 
+                   static_cast<long int>(pos));
            throw SDIFSeekError(eError,
!                               msg,
                                0,eUnknown,__FILE__,__LINE__);
          }