sdif-cvs — This list receives the CVS logs

[Sdif-cvs] Easdif/swig/python CMakeLists.txt,1.21,1.22

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

Update of /cvsroot/sdif/Easdif/swig/python
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20135/swig/python

Modified Files:
	CMakeLists.txt 
Log Message:
changed install swig python target name to avoid conflicts

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CMakeLists.txt	11 Apr 2014 15:22:24 -0000	1.21
--- CMakeLists.txt	23 May 2014 10:56:14 -0000	1.22
***************
*** 98,112 ****
    ADD_DEPENDENCIES(checkswig checkswigpython)
  
!   ADD_CUSTOM_TARGET(install_python_module_locally
      COMMENT install python swig interface into userbase
      COMMAND ${PYTHON} setup.py install --user
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
!   ADD_DEPENDENCIES(install_python_module_locally pythonswig)
!   ADD_CUSTOM_TARGET(install_python_module_globally    
      COMMENT install python swig interface into userbase
      COMMAND ${PYTHON} setup.py install
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
  
!   ADD_DEPENDENCIES(install_python_module_globally pythonswig)
  ENDIF(PYTHON) 
  
--- 98,112 ----
    ADD_DEPENDENCIES(checkswig checkswigpython)
  
!   ADD_CUSTOM_TARGET(install_python_easdif_module_locally
      COMMENT install python swig interface into userbase
      COMMAND ${PYTHON} setup.py install --user
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
!   ADD_DEPENDENCIES(install_python_easdif_module_locally pythonswig)
!   ADD_CUSTOM_TARGET(install_python_easdif_module_globally    
      COMMENT install python swig interface into userbase
      COMMAND ${PYTHON} setup.py install
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
  
!   ADD_DEPENDENCIES(install_python_easdif_module_globally pythonswig)
  ENDIF(PYTHON) 
  

[Sdif-cvs] Easdif/swig easdif-common.i.in,1.20,1.21

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20089/swig

Modified Files:
	easdif-common.i.in 
Log Message:
added exception typemap for Accessing matrices in frames

Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** easdif-common.i.in	23 May 2014 10:31:56 -0000	1.20
--- easdif-common.i.in	23 May 2014 10:55:22 -0000	1.21
***************
*** 6,9 ****
--- 6,12 ----
  //
  // $Log$
+ // Revision 1.21  2014/05/23 10:55:22  roebel
+ // added exception typemap for Accessing matrices in frames
+ //
  // Revision 1.20  2014/05/23 10:31:56  roebel
  // Use exception typemap to improve exception handling for
***************
*** 184,187 ****
--- 187,194 ----
  %}
  
+ %typemap(throws) SDIFMatrixNotAvailable  %{
+   SWIG_exception(SWIG_IndexError, $1.getmessage().c_str());
+   SWIG_fail;
+ %}
  
  %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdif_matrix.hpp"

[Sdif-cvs] Easdif CMakeLists.txt,1.81,1.82

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

Update of /cvsroot/sdif/Easdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19270

Modified Files:
	CMakeLists.txt 
Log Message:
Fixed verbose output.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** CMakeLists.txt	11 Apr 2014 15:22:23 -0000	1.81
--- CMakeLists.txt	23 May 2014 10:43:05 -0000	1.82
***************
*** 40,44 ****
  SET(EASDIF_VERSION_MAJ 1)
  SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 21)
  SET(EASDIF_VERSION  "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
  
--- 40,44 ----
  SET(EASDIF_VERSION_MAJ 1)
  SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 22)
  SET(EASDIF_VERSION  "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
  
***************
*** 389,395 ****
  MESSAGE(STATUS "Option summary:")
  MESSAGE(STATUS "install prefix (CMAKE_INSTALL_PREFIX)         : ${CMAKE_INSTALL_PREFIX}")
! MESSAGE(STATUS "enable swig python interface (DO_PYTHON)      : ${DO_PYTHON}")
! MESSAGE(STATUS "enable swig perl interface (DO_PERL)          : ${DO_PERL}")
! MESSAGE(STATUS "enable swig java interface (DO_JAVA)          : ${DO_JAVA}")
  MESSAGE(STATUS "build static Easdif lib (EASDIF_BUILD_STATIC) : ${EASDIF_BUILD_STATIC}")
  MESSAGE(STATUS "build static sdif lib (SDIF_BUILD_STATIC)     : ${SDIF_BUILD_STATIC}")
--- 389,395 ----
  MESSAGE(STATUS "Option summary:")
  MESSAGE(STATUS "install prefix (CMAKE_INSTALL_PREFIX)         : ${CMAKE_INSTALL_PREFIX}")
! MESSAGE(STATUS "enable swig python interf. (EASDIF_DO_PYTHON) : ${EASDIF_DO_PYTHON}")
! MESSAGE(STATUS "enable swig perl interface (EASDIF_DO_PERL)   : ${EASDIF_DO_PERL}")
! MESSAGE(STATUS "enable swig java interface (EASDIF_DO_JAVA)   : ${EASDIF_DO_JAVA}")
  MESSAGE(STATUS "build static Easdif lib (EASDIF_BUILD_STATIC) : ${EASDIF_BUILD_STATIC}")
  MESSAGE(STATUS "build static sdif lib (SDIF_BUILD_STATIC)     : ${SDIF_BUILD_STATIC}")

[Sdif-cvs] Easdif/swig/python easdif-python.i,1.16,1.17

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

Update of /cvsroot/sdif/Easdif/swig/python
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18608

Modified Files:
	easdif-python.i 
Log Message:
Changed so that ReadNext..Frame methods properly throw EOF exception.


Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** easdif-python.i	21 May 2014 23:55:21 -0000	1.16
--- easdif-python.i	23 May 2014 10:33:15 -0000	1.17
***************
*** 6,9 ****
--- 6,12 ----
  //
  // $Log$
+ // Revision 1.17  2014/05/23 10:33:15  roebel
+ // Changed so that ReadNext..Frame methods properly throw EOF exception.
+ //
  // Revision 1.16  2014/05/21 23:55:21  roebel
  // Fixed FrameType constructor to accept python strings with exactly 4 chars.
***************
*** 76,79 ****
--- 79,116 ----
  %include ../easdif-defines.i
  
+ %exception ReadNextFrame {
+         try {
+                 $action
+         } catch(const SDIFEof& e) {
+                 PyErr_SetString(PyExc_EOFError,e.getmessage().c_str());
+                 return 0;
+         } catch(const SDIFException& e) {
+                 PyErr_SetString(PyExc_IOError,e.getmessage().c_str());
+                 return 0;
+         } catch(const std::exception& e) {
+                 PyErr_SetString(PyExc_IOError, e.what());
+                 return 0;
+         } catch(...) {
+                 SWIG_exception(SWIG_UnknownError,"Unknown exception");
+         }
+ }
+ 
+ %exception ReadNextSelectedFrame {
+         try {
+                 $action
+         } catch(const SDIFEof& e) {
+                 PyErr_SetString(PyExc_EOFError,e.getmessage().c_str());
+                 return 0;
+         } catch(const SDIFException& e) {
+                 PyErr_SetString(PyExc_IOError,e.getmessage().c_str());
+                 return 0;
+         } catch(const std::exception& e) {
+                 PyErr_SetString(PyExc_IOError, e.what());
+                 return 0;
+         } catch(...) {
+                 SWIG_exception(SWIG_UnknownError,"Unknown exception");
+         }
+ }
+ 
  %{
  #include "easdif/easdif.h"
***************
*** 232,239 ****
--- 269,311 ----
   }
  
+ 
+ 
  #ifdef USE_NUMPY
  
+ %exception GetColA {
+   $action
+   if( result == 0) {
+     PyErr_SetString(PyExc_IndexError,"GetColA::output array does not match column size"); 
+     return 0;
+   }
+ }
+ %exception SetColA {
+   $action
+   if( result == 0) {
+     PyErr_SetString(PyExc_IndexError,"SetColA::input array does not match column size"); 
+     return 0;
+   }
+ }
+ %exception GetRowA {
+   $action
+   if( result == 0) {
+     PyErr_SetString(PyExc_IndexError,"GetRowA::output array does not match row size"); 
+     return 0;
+   }
+ }
+ %exception SetRowA {
+   $action
+   if( result == 0) {
+     PyErr_SetString(PyExc_IndexError,"SetRowA::input array does not match row size"); 
+     return 0;
+   }
+ }
+ 
+ 
+ 
+ 
  %extend Easdif::SDIFMatrix {
  
+ 
  %apply (double* INPLACE_ARRAY1, int DIM1) {(double *outarr, int outarrsize)}
  %apply (double* IN_ARRAY1, int DIM1) {(const double *inarr, int inarrsize)}
***************
*** 255,272 ****
  %apply (unsigned int* IN_ARRAY1, int DIM1) {(const unsigned int *inarr, int inarrsize)}
  
! #define MakeGetColA(type) void \
      GetColA(type * outarr, int outarrsize, int col) { \
      if ($self->GetNbRows() != outarrsize ) {\
!       throw std::runtime_error("GetColA::output array does not match column size"); \
      }\
      $self->GetCol(outarr, col); \
!     return; \
    }
!  void  GetColA(signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       throw std::runtime_error("GetColA::output array does not match column size"); 
      }
      $self->GetCol(reinterpret_cast<char*> (outarr), col); 
!     return; 
    }
  
--- 327,344 ----
  %apply (unsigned int* IN_ARRAY1, int DIM1) {(const unsigned int *inarr, int inarrsize)}
  
! #define MakeGetColA(type) int \
      GetColA(type * outarr, int outarrsize, int col) { \
      if ($self->GetNbRows() != outarrsize ) {\
!       return 0; \
      }\
      $self->GetCol(outarr, col); \
!     return 1; \
    }
!   int  GetColA(signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       return 0;
      }
      $self->GetCol(reinterpret_cast<char*> (outarr), col); 
!     return 1; 
    }
  
***************
*** 280,298 ****
     MakeGetColA(char);
  
! #define MakeGetRowA(type) void \
      GetRowA(type * outarr, int outarrsize, int col) { \
      if ($self->GetNbCols() != outarrsize ) {\
!       throw std::runtime_error("GetRowA::output array does not match row size"); \
      }\
      $self->GetRow(outarr, col); \
!     return; \
    }
  
!  void  GetRowA(signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       throw std::runtime_error("GetRowA::output array does not match column size"); 
      }
      $self->GetRow(reinterpret_cast<char*> (outarr), col); 
!     return; 
    }
  
--- 352,370 ----
     MakeGetColA(char);
  
! #define MakeGetRowA(type) int \
      GetRowA(type * outarr, int outarrsize, int col) { \
      if ($self->GetNbCols() != outarrsize ) {\
!       return 0; \
      }\
      $self->GetRow(outarr, col); \
!     return 1; \
    }
  
!  int  GetRowA(signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       return 0; 
      }
      $self->GetRow(reinterpret_cast<char*> (outarr), col); 
!     return 1; 
    }
  
***************
*** 306,320 ****
     MakeGetRowA(char);
  
! #define MakeSetColA(type) void \
      SetColA(const type * inarr, int inarrsize, int col) { \
      if ($self->GetNbRows() != inarrsize ) {\
!       throw std::runtime_error("SetColA::input array does not match column size"); \
      }\
      $self->SetCol(inarr, col);                  \
!     return; \
    }
  
- 
- 
     MakeSetColA(double);
     MakeSetColA(float);
--- 378,390 ----
     MakeGetRowA(char);
  
! #define MakeSetColA(type) int \
      SetColA(const type * inarr, int inarrsize, int col) { \
      if ($self->GetNbRows() != inarrsize ) {\
!       return 0; \
      }\
      $self->SetCol(inarr, col);                  \
!     return 1; \
    }
  
     MakeSetColA(double);
     MakeSetColA(float);
***************
*** 326,344 ****
     MakeSetColA(char);
  
!  void  SetColA(const signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       throw std::runtime_error("SetColA::output array does not match column size"); 
      }
      $self->SetCol(reinterpret_cast<const char*> (outarr), col); 
!     return; 
    }
  
! #define MakeSetRowA(type) void \
      SetRowA(const type * inarr, int inarrsize, int col) { \
      if ($self->GetNbCols() != inarrsize ) {\
!       throw std::runtime_error("SetRowA::input array does not match row size"); \
      }\
      $self->SetRow(inarr, col); \
!     return; \
    }
  
--- 396,414 ----
     MakeSetColA(char);
  
!    int SetColA(const signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       return 0;
      }
      $self->SetCol(reinterpret_cast<const char*> (outarr), col); 
!     return 1; 
    }
  
! #define MakeSetRowA(type) int \
      SetRowA(const type * inarr, int inarrsize, int col) { \
      if ($self->GetNbCols() != inarrsize ) {\
!       return 0; \
      }\
      $self->SetRow(inarr, col); \
!     return 1; \
    }
  
***************
*** 353,364 ****
     MakeSetRowA(char);
  
!  void  SetRowA(const signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       throw std::runtime_error("SetRowA::output array does not match column size"); 
      }
      $self->SetRow(reinterpret_cast<const char*> (outarr), col); 
!     return; 
    }
  
  }
  #endif
--- 423,493 ----
     MakeSetRowA(char);
  
!   int  SetRowA(const signed char * outarr, int outarrsize, int col) { 
      if ($self->GetNbRows() != outarrsize ) {
!       return 0;
      }
      $self->SetRow(reinterpret_cast<const char*> (outarr), col); 
!     return 1; 
!   }
! 
! 
!   PyObject*                                         
!     GetMatrixData() { 
!     int ssrows = $self->GetNbRows();
!     int sscols = $self->GetNbCols();
!     int type = 0;
!     int internal_type = $self->GetType();
!     if (internal_type == eFloat8)
!       type =NPY_DOUBLE;
!     else if (internal_type == eFloat4)
!       type =NPY_FLOAT32;
!     else if (internal_type == eInt8)
!       type =NPY_INT64;
!     else if (internal_type == eUInt8)
!       type =NPY_UINT64;
!     else if (internal_type == eInt4)
!       type =NPY_INT32;
!     else if (internal_type == eUInt4)
!       type =NPY_UINT32;
!     else if (internal_type == eInt2)
!       type =NPY_INT16;
!     else if (internal_type == eUInt2)
!       type =NPY_UINT16;
! 
!     npy_intp ss[2];
!     ss[0] = ssrows;
!     ss[1] = sscols;
!     PyArrayObject *pa = reinterpret_cast<PyArrayObject*>(PyArray_SimpleNew(2, ss, type));
!     if (!pa) { 
!       PyErr_SetString(PyExc_RuntimeError, "cannot create umpy array for matrix content\n");
!       return 0;
!     }
!     // or fortran style column continuous which is the format used in SDIF
!     PyArray_ENABLEFLAGS(pa, NPY_ARRAY_F_CONTIGUOUS);
!     PyArray_CLEARFLAGS(pa, NPY_ARRAY_C_CONTIGUOUS);
!     if (ssrows * sscols) {
!       void *pp = PyArray_DATA(pa);
!       memcpy(pp, $self->GetData(), ssrows*sscols*$self->GetElementSize());
!     }
!     return reinterpret_cast<PyObject*>(pa);
!   }
! 
!  int  GetRowA(signed char * outarr, int outarrsize, int col) { 
!     if ($self->GetNbRows() != outarrsize ) {
!       return 0; 
!     }
!     $self->GetRow(reinterpret_cast<char*> (outarr), col); 
!     return 1; 
    }
  
+    MakeGetRowA(double);
+    MakeGetRowA(float);
+    MakeGetRowA(unsigned int);
+    MakeGetRowA(unsigned short);
+    MakeGetRowA(unsigned char);
+    MakeGetRowA(int);
+    MakeGetRowA(short);
+    MakeGetRowA(char);
+ 
  }
  #endif

[Sdif-cvs] Easdif/swig easdif-common.i.in,1.19,1.20

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18440/swig

Modified Files:
	easdif-common.i.in 
Log Message:
Use exception typemap to improve exception handling for
Matrix.Get/Set methods.


Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** easdif-common.i.in	21 May 2014 22:11:28 -0000	1.19
--- easdif-common.i.in	23 May 2014 10:31:56 -0000	1.20
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.20  2014/05/23 10:31:56  roebel
+ // Use exception typemap to improve exception handling for
+ // Matrix.Get/Set methods.
+ //
  // Revision 1.19  2014/05/21 22:11:28  roebel
  // Added vector template for std::vector<MatrixType> and std::vector<FrameType> that are used y Entity::GetTypes functions.
***************
*** 153,156 ****
--- 157,162 ----
  %ignore Easdif::SDIFFrame::GetMatrixWithSig(const SdifSignature) const;
  
+ // cannot be used (returns a void *)
+ %ignore GetData;
  
  // if this is given then the
***************
*** 168,185 ****
  
  
! // filter all exceptions and transform into Target exceptions preserving the error message 
! %exception {
!         try {
!                 $action
!         } catch(const SDIFArrayPosition& e) {
!                 SWIG_exception(SWIG_IndexError,e.getmessage().c_str());
!         } catch(const SDIFException& e) {
!                 SWIG_exception(SWIG_RuntimeError,e.getmessage().c_str());
!         } catch(const std::exception& e) {
!                 SWIG_exception(SWIG_SystemError, e.what());
!         } catch(...) {
!                 SWIG_exception(SWIG_UnknownError,"Unknown exception");
!         }
! }
  
  %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdif_matrix.hpp"
--- 174,187 ----
  
  
! %typemap(throws) SDIFArrayPosition  %{
!   SWIG_exception(SWIG_IndexError, $1.getmessage().c_str());
!   SWIG_fail;
! %}
! 
! %typemap(throws) SDIFMatrixDataError  %{
!   SWIG_exception(SWIG_ValueError, $1.getmessage().c_str());
!   SWIG_fail;
! %}
! 
  
  %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdif_matrix.hpp"
***************
*** 224,227 ****
--- 226,242 ----
  %template(SetCol) Easdif::SDIFMatrix::SetCol<unsigned int>;
  
+ // filter all exceptions and transform into Target exceptions preserving the error message 
+ %exception {
+         try {
+                 $action
+         } catch(const SDIFException& e) {
+                 SWIG_exception(SWIG_RuntimeError,e.getmessage().c_str());
+         } catch(const std::exception& e) {
+                 SWIG_exception(SWIG_SystemError, e.what());
+         } catch(...) {
+                 SWIG_exception(SWIG_UnknownError,"Unknown exception");
+         }
+ }
+ 
  
  namespace std {

[Sdif-cvs] Easdif/easdif sdifmatrixdata.hpp, 1.4, 1.5 sdifmatrixdatainterface.hpp, 1.2, 1.3

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

Update of /cvsroot/sdif/Easdif/easdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18343/easdif

Modified Files:
	sdifmatrixdata.hpp sdifmatrixdatainterface.hpp 
Log Message:
Added interface for retrieving raw pointer and elementsize.


Index: sdifmatrixdatainterface.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifmatrixdatainterface.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sdifmatrixdatainterface.hpp	22 Jan 2008 00:51:36 -0000	1.2
--- sdifmatrixdatainterface.hpp	23 May 2014 10:30:26 -0000	1.3
***************
*** 37,40 ****
--- 37,43 ----
   * 
   * $Log$
+  * Revision 1.3  2014/05/23 10:30:26  roebel
+  * Added interface for retrieving raw pointer and elementsize.
+  *
   * Revision 1.2  2008/01/22 00:51:36  roebel
   * Completed support for all sdif integer types.
***************
*** 161,167 ****
    virtual void   SetCol(const SdifUInt2 *,int i)=0;
    virtual void   SetCol(const SdifUInt1 *,int i)=0;
!   
    virtual SDIFMatrixDataInterface * clone()=0;
  
      virtual ~SDIFMatrixDataInterface() {};
  };
--- 164,173 ----
    virtual void   SetCol(const SdifUInt2 *,int i)=0;
    virtual void   SetCol(const SdifUInt1 *,int i)=0;
! 
!   virtual void * GetData() = 0;
!   virtual int    GetElementSize() = 0;
    virtual SDIFMatrixDataInterface * clone()=0;
  
+ 
      virtual ~SDIFMatrixDataInterface() {};
  };

Index: sdifmatrixdata.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifmatrixdata.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sdifmatrixdata.hpp	11 Jun 2011 17:08:16 -0000	1.4
--- sdifmatrixdata.hpp	23 May 2014 10:30:25 -0000	1.5
***************
*** 37,40 ****
--- 37,43 ----
   * 
   * $Log$
+  * Revision 1.5  2014/05/23 10:30:25  roebel
+  * Added interface for retrieving raw pointer and elementsize.
+  *
   * Revision 1.4  2011/06/11 17:08:16  roebel
   * Moved constructor and destructor definition out of class scope to
***************
*** 601,610 ****
  /** 
   * \ingroup getdata
!  * get the vector of data
!  * @return vector of template type
   */
!     inline std::vector<T>& GetData()
  	{
! 	    return m_Data;
  	}
  
--- 604,619 ----
  /** 
   * \ingroup getdata
!  * get a void pointer to the start of the memory of the internal matrix
!  * @return void * to internal storage
   */
!      void* GetData()
  	{
!           if (m_Data.size() )
! 	    return &m_Data[0];
!           return 0;
! 	}
!      int GetElementSize()
! 	{
!           return sizeof(T);
  	}
  

[Sdif-cvs] Easdif/easdif sdif_matrix.hpp,1.10,1.11

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

Update of /cvsroot/sdif/Easdif/easdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17880

Modified Files:
	sdif_matrix.hpp 
Log Message:
Added throw specifications.


Index: sdif_matrix.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sdif_matrix.hpp	2 Sep 2012 01:10:27 -0000	1.10
--- sdif_matrix.hpp	23 May 2014 10:23:46 -0000	1.11
***************
*** 37,40 ****
--- 37,43 ----
   * 
   * $Log$
+  * Revision 1.11  2014/05/23 10:23:46  roebel
+  * Added throw specifications.
+  *
   * Revision 1.10  2012/09/02 01:10:27  roebel
   * Fixed confusing argument names.
***************
*** 486,489 ****
--- 489,508 ----
      std::string GetColName(int i) const;
  
+     /** 
+      * \ingroup membmat
+      * get a void pointer to the start of the memory of the internal matrix
+      * @return void * to internal data
+      */
+     void* GetData() {
+       return mInter->GetData();
+     }
+ 
+     /** 
+      * \ingroup membmat
+      * @return element size in bytes of internal representation
+      */
+     int GetElementSize()	{
+       return mInter->GetElementSize();
+     }
  
  
***************
*** 519,523 ****
       * @return the value
       */
!     int GetUChar(int i, int j) const {return mInter->GetUChar(i, j);};
  
      /**
--- 538,543 ----
       * @return the value
       */
!     int GetUChar(int i, int j) const throw (SDIFArrayPosition){
!       return mInter->GetUChar(i, j);};
  
      /**
***************
*** 529,533 ****
       * @return the value
       */
!     int GetInt(int i, int j) const {return mInter->GetInt(i, j);};
  
  
--- 549,554 ----
       * @return the value
       */
!     int GetInt(int i, int j) const throw (SDIFArrayPosition){
!       return mInter->GetInt(i, j);};
  
  
***************
*** 540,544 ****
       * @return the value
       */
!     float GetFloat(int i, int j)const {    return mInter->GetFloat(i, j);}
  
      /**
--- 561,566 ----
       * @return the value
       */
!     float GetFloat(int i, int j)const throw (SDIFArrayPosition){ 
!       return mInter->GetFloat(i, j);}
  
      /**
***************
*** 551,555 ****
       * @return the value
       */
!     double GetDouble(int i, int j) const {   return mInter->GetDouble(i, j);}
  
  
--- 573,578 ----
       * @return the value
       */
!     double GetDouble(int i, int j) const throw (SDIFArrayPosition) {
!       return mInter->GetDouble(i, j);}
  
  
***************
*** 564,568 ****
       */
      template<typename Tout>
!     void Get(int i, int j, Tout& value)
      {
        value = static_cast<Tout>(mInter->GetDouble(i, j));
--- 587,591 ----
       */
      template<typename Tout>
!     void Get(int i, int j, Tout& value) const throw (SDIFArrayPosition)
      {
        value = static_cast<Tout>(mInter->GetDouble(i, j));
***************
*** 570,574 ****
  
      // specialization for float that does not use cast
!     void Get(int i, int j, float& value)
      {
        value = mInter->GetFloat(i, j);
--- 593,597 ----
  
      // specialization for float that does not use cast
!     void Get(int i, int j, float& value) const throw (SDIFArrayPosition)
      {
        value = mInter->GetFloat(i, j);
***************
*** 576,580 ****
    
      // specialization for int that does not use cast
!     void Get(int i, int j, int& value)
      {
        value = mInter->GetInt(i, j);
--- 599,603 ----
    
      // specialization for int that does not use cast
!     void Get(int i, int j, int& value)  const throw (SDIFArrayPosition)
      {
        value = mInter->GetInt(i, j);
***************
*** 584,589 ****
  
      // std::string Get() ??? exception when not string matrix?
!     void Get(std::string& value)
!       throw(SDIFMatrixDataError)
      {
  
--- 607,611 ----
  
      // std::string Get() ??? exception when not string matrix?
!     void Get(std::string& value)  const throw(SDIFMatrixDataError)
      {
  
***************
*** 678,697 ****
       */
      template<typename Tin>
!     void Set(int i, int j, const Tin& value)
      {
        mInter->Set(i, j, static_cast<double>(value) );
      }
    
!     void Set(int i, int j, const float value)
      {
        mInter->Set(i, j, value);
      }
    
!     void Set(int i, int j, const int value)
      {
        mInter->Set(i, j, value);
      }
  
!     void Set(int i, int j, const unsigned char value)
      {
        mInter->Set(i, j, value);
--- 700,719 ----
       */
      template<typename Tin>
!     void Set(int i, int j, const Tin& value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, static_cast<double>(value) );
      }
    
!     void Set(int i, int j, const float value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
      }
    
!     void Set(int i, int j, const int value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
      }
  
!     void Set(int i, int j, const unsigned char value) throw (SDIFArrayPosition)
      {
        mInter->Set(i, j, value);
***************
*** 699,703 ****
  
  
- 
      /** 
       * Set matrix type to eText, change matrix size to num. of bytes in
--- 721,724 ----

[Sdif-cvs] Easdif/swig/python easdif-python.i, 1.15, 1.16 sdiftypemap-python.i, 1.5, 1.6

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

Update of /cvsroot/sdif/Easdif/swig/python
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14023/python

Modified Files:
	easdif-python.i sdiftypemap-python.i 
Log Message:
Fixed FrameType constructor to accept python strings with exactly 4 chars.
Added __str__ method to FrameType and MatrixType structs to be able to print them.


Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** easdif-python.i	11 Apr 2014 17:33:31 -0000	1.15
--- easdif-python.i	21 May 2014 23:55:21 -0000	1.16
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.16  2014/05/21 23:55:21  roebel
+ // Fixed FrameType constructor to accept python strings with exactly 4 chars.
+ // Added __str__ method to FrameType and MatrixType structs to be able to print them.
+ //
  // Revision 1.15  2014/04/11 17:33:31  roebel
  // Support reading with int8 numpy type.
***************
*** 192,195 ****
--- 196,234 ----
  }
  
+ %extend Easdif::FrameType{
+     PyObject* __str__() {
+       std::string str;
+       str = " 1FTD ";
+       str += SdifSignatureToString($self->mSig);
+       str += "\n\t{\n\t ";
+       for(int ii=0; ii< $self->mvMatrixTypes.size(); ++ii) {
+         str += SdifSignatureToString($self->mvMatrixTypes[ii].GetSignature());
+         str += "\t";
+         str += $self->mvMatrixNames[ii];
+         str += ";\n\t ";
+       }
+       str += "}\n";
+       
+       return PyString_FromString(str.c_str());
+     }
+  }
+ 
+ %extend Easdif::MatrixType{
+     PyObject* __str__() {
+       std::string str;
+       str = " 1MTD ";
+       str += SdifSignatureToString($self->mSig);
+       str += "\t{";
+       int nb = $self->GetNbCols();
+       for(int ii=0; ii< nb; ++ii) {
+         str += $self->mvColumnNames[ii];
+         if (ii < nb - 1)
+           str += ",";
+       }
+       str += "}\n";
+       
+       return PyString_FromString(str.c_str());
+     }
+  }
  
  #ifdef USE_NUMPY

Index: sdiftypemap-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/sdiftypemap-python.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sdiftypemap-python.i	26 Nov 2006 20:35:41 -0000	1.5
--- sdiftypemap-python.i	21 May 2014 23:55:21 -0000	1.6
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.6  2014/05/21 23:55:21  roebel
+ // Fixed FrameType constructor to accept python strings with exactly 4 chars.
+ // Added __str__ method to FrameType and MatrixType structs to be able to print them.
+ //
  // Revision 1.5  2006/11/26 20:35:41  roebel
  // Unified by means of ../easdif-common-init.i
***************
*** 32,36 ****
  %typemap(in) SdifSignature 
  {
!     if (PyString_Check($input))
      {
  	$1 = SdifStringToSignature(PyString_AsString($input));
--- 36,40 ----
  %typemap(in) SdifSignature 
  {
!   if (PyString_Check($input) && (PyString_Size($input) == 4))
      {
  	$1 = SdifStringToSignature(PyString_AsString($input));
***************
*** 42,50 ****
      else  
      {
! 	PyErr_SetString(PyExc_TypeError, "not a String");
  	return NULL;
      }
  }
  
  %typemap(out) SdifSignature 
  {
--- 46,59 ----
      else  
      {
!       PyErr_SetString(PyExc_TypeError, "Signature argument has to be an integer or a 4 char string");
  	return NULL;
      }
  }
  
+ %typemap(typecheck, precedence=SWIG_TYPECHECK_INTEGER) SdifSignature {
+   $1 = (PyString_Check($input)  
+          || PyInt_Check($input)) ? 1 : 0;
+ }
+ 
  %typemap(out) SdifSignature 
  {

[Sdif-cvs] Easdif/swig easdif-common.i.in,1.18,1.19

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7774

Modified Files:
	easdif-common.i.in 
Log Message:
Added vector template for std::vector<MatrixType> and std::vector<FrameType> that are used y Entity::GetTypes functions.


Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** easdif-common.i.in	10 Apr 2014 21:34:07 -0000	1.18
--- easdif-common.i.in	21 May 2014 22:11:28 -0000	1.19
***************
*** 6,9 ****
--- 6,12 ----
  //
  // $Log$
+ // Revision 1.19  2014/05/21 22:11:28  roebel
+ // Added vector template for std::vector<MatrixType> and std::vector<FrameType> that are used y Entity::GetTypes functions.
+ //
  // Revision 1.18  2014/04/10 21:34:07  roebel
  // More robust include file organisation.
***************
*** 222,223 ****
--- 225,230 ----
  
  
+ namespace std {
+   %template(MatrixTypeVector) vector<Easdif::MatrixType>;
+   %template(FrameTypeVector) vector<Easdif::FrameType>;
+ }

[Sdif-cvs] Easdif/swig/python easdif-python.i,1.14,1.15

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

Update of /cvsroot/sdif/Easdif/swig/python
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17370/swig/python

Modified Files:
	easdif-python.i 
Log Message:
Support reading with int8 numpy type.


Index: easdif-python.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** easdif-python.i	10 Apr 2014 21:34:07 -0000	1.14
--- easdif-python.i	11 Apr 2014 17:33:31 -0000	1.15
***************
*** 6,9 ****
--- 6,12 ----
  //
  // $Log$
+ // Revision 1.15  2014/04/11 17:33:31  roebel
+ // Support reading with int8 numpy type.
+ //
  // Revision 1.14  2014/04/10 21:34:07  roebel
  // More robust include file organisation.
***************
*** 204,207 ****
--- 207,212 ----
  %apply (char* INPLACE_ARRAY1, int DIM1) {(char *outarr, int outarrsize)}
  %apply (char* IN_ARRAY1, int DIM1) {(char *inarr, int inarrsize)}
+ %apply (signed char* INPLACE_ARRAY1, int DIM1) {(signed char *outarr, int outarrsize)}
+ %apply (signed char* IN_ARRAY1, int DIM1) {(signed char *inarr, int inarrsize)}
  %apply (unsigned char* INPLACE_ARRAY1, int DIM1) {(unsigned char *outarr, int outarrsize)}
  %apply (unsigned char* IN_ARRAY1, int DIM1) {(const unsigned char *inarr, int inarrsize)}
***************
*** 219,222 ****
--- 224,234 ----
      return; \
    }
+  void  GetColA(signed char * outarr, int outarrsize, int col) { 
+     if ($self->GetNbRows() != outarrsize ) {
+       throw std::runtime_error("GetColA::output array does not match column size"); 
+     }
+     $self->GetCol(reinterpret_cast<char*> (outarr), col); 
+     return; 
+   }
  
     MakeGetColA(double);
***************
*** 238,241 ****
--- 250,261 ----
    }
  
+  void  GetRowA(signed char * outarr, int outarrsize, int col) { 
+     if ($self->GetNbRows() != outarrsize ) {
+       throw std::runtime_error("GetRowA::output array does not match column size"); 
+     }
+     $self->GetRow(reinterpret_cast<char*> (outarr), col); 
+     return; 
+   }
+ 
     MakeGetRowA(double);
     MakeGetRowA(float);
***************
*** 243,248 ****
     MakeGetRowA(unsigned short);
     MakeGetRowA(unsigned char);
-    MakeGetRowA(short);
     MakeGetRowA(int);
     MakeGetRowA(char);
  
--- 263,268 ----
     MakeGetRowA(unsigned short);
     MakeGetRowA(unsigned char);
     MakeGetRowA(int);
+    MakeGetRowA(short);
     MakeGetRowA(char);
  
***************
*** 256,259 ****
--- 276,281 ----
    }
  
+ 
+ 
     MakeSetColA(double);
     MakeSetColA(float);
***************
*** 261,268 ****
     MakeSetColA(unsigned short);
     MakeSetColA(unsigned char);
-    MakeSetColA(short);
     MakeSetColA(int);
     MakeSetColA(char);
  
  #define MakeSetRowA(type) void \
      SetRowA(const type * inarr, int inarrsize, int col) { \
--- 283,298 ----
     MakeSetColA(unsigned short);
     MakeSetColA(unsigned char);
     MakeSetColA(int);
+    MakeSetColA(short);
     MakeSetColA(char);
  
+  void  SetColA(const signed char * outarr, int outarrsize, int col) { 
+     if ($self->GetNbRows() != outarrsize ) {
+       throw std::runtime_error("SetColA::output array does not match column size"); 
+     }
+     $self->SetCol(reinterpret_cast<const char*> (outarr), col); 
+     return; 
+   }
+ 
  #define MakeSetRowA(type) void \
      SetRowA(const type * inarr, int inarrsize, int col) { \
***************
*** 274,277 ****
--- 304,308 ----
    }
  
+ 
     MakeSetRowA(double);
     MakeSetRowA(float);
***************
*** 279,288 ****
     MakeSetRowA(unsigned short);
     MakeSetRowA(unsigned char);
     MakeSetRowA(short);
     MakeSetRowA(char);
-    MakeSetRowA(int);
- 
- 
  
  
  }
--- 310,324 ----
     MakeSetRowA(unsigned short);
     MakeSetRowA(unsigned char);
+    MakeSetRowA(int);
     MakeSetRowA(short);
     MakeSetRowA(char);
  
+  void  SetRowA(const signed char * outarr, int outarrsize, int col) { 
+     if ($self->GetNbRows() != outarrsize ) {
+       throw std::runtime_error("SetRowA::output array does not match column size"); 
+     }
+     $self->SetRow(reinterpret_cast<const char*> (outarr), col); 
+     return; 
+   }
  
  }

[Sdif-cvs] Easdif CMakeLists.txt,1.80,1.81

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

Update of /cvsroot/sdif/Easdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7143

Modified Files:
	CMakeLists.txt 
Log Message:
Fixed remaining conditions that use old swig option variables.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** CMakeLists.txt	11 Apr 2014 12:11:36 -0000	1.80
--- CMakeLists.txt	11 Apr 2014 15:22:23 -0000	1.81
***************
*** 78,90 ****
    ADD_CUSTOM_TARGET(install_doc) 
    ADD_CUSTOM_TARGET(check)
-   IF(DOSWIG)
-     ADD_CUSTOM_TARGET(checkswig)
-   ENDIF(DOSWIG)
  ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
  
- IF(DOSWIG)
-   SET(EASDIF_BUILD_STATIC 1)
- ENDIF(DOSWIG)
- 
  
  IF (WIN32)
--- 78,83 ----

[Sdif-cvs] Easdif/swig CMakeLists.txt,1.11,1.12 README,1.9,1.10

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24166/swig

Modified Files:
	CMakeLists.txt README 
Log Message:
Changed control variables for swig interfaces from DO_XYZ to EASDIF_DO_XYZ to improve readability when run within another module

Index: README
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** README	21 Mar 2014 23:56:41 -0000	1.9
--- README	11 Apr 2014 12:11:39 -0000	1.10
***************
*** 54,58 ****
  
  > # configuration
! > cmake PATH_TO_EASDIF_SRC_DIR -DDO_PYTHON:BOOL=ON 
  
  # build swig interface (example for python)
--- 54,58 ----
  
  > # configuration
! > cmake PATH_TO_EASDIF_SRC_DIR -DEASDIF_DO_PYTHON:BOOL=ON 
  
  # build swig interface (example for python)

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CMakeLists.txt	10 Apr 2014 21:34:06 -0000	1.11
--- CMakeLists.txt	11 Apr 2014 12:11:39 -0000	1.12
***************
*** 21,36 ****
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
  
!   IF(DO_PYTHON)
      MESSAGE(STATUS "python")
      ADD_SUBDIRECTORY(python)
!   ENDIF(DO_PYTHON)
!   IF(DO_PERL)
      MESSAGE(STATUS "perl5")
      ADD_SUBDIRECTORY(perl5)
!   ENDIF(DO_PERL)
!   IF(DO_JAVA)
      MESSAGE(STATUS "java")
      ADD_SUBDIRECTORY(java)
!   ENDIF(DO_JAVA)
  
  ENDIF(SWIG_FOUND)
--- 21,36 ----
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
  
!   IF(EASDIF_DO_PYTHON)
      MESSAGE(STATUS "python")
      ADD_SUBDIRECTORY(python)
!   ENDIF(EASDIF_DO_PYTHON)
!   IF(EASDIF_DO_PERL)
      MESSAGE(STATUS "perl5")
      ADD_SUBDIRECTORY(perl5)
!   ENDIF(EASDIF_DO_PERL)
!   IF(EASDIF_DO_JAVA)
      MESSAGE(STATUS "java")
      ADD_SUBDIRECTORY(java)
!   ENDIF(EASDIF_DO_JAVA)
  
  ENDIF(SWIG_FOUND)

[Sdif-cvs] Easdif/swig CMakeLists.txt, 1.10, 1.11 easdif-common.i.in, 1.17, 1.18 easdif-defines.i, 1.2, 1.3 sdif-common.i.in, 1.1, 1.2

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9724/swig

Modified Files:
	CMakeLists.txt easdif-common.i.in easdif-defines.i 
	sdif-common.i.in 
Log Message:
More robust include file organisation.
Extended types of vector that are supported to read from matrices and vectors.


Index: sdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/sdif-common.i.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sdif-common.i.in	30 Apr 2003 11:34:31 -0000	1.1
--- sdif-common.i.in	10 Apr 2014 21:34:07 -0000	1.2
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.2  2014/04/10 21:34:07  roebel
+ // More robust include file organisation.
+ // Extended types of vector that are supported to read from matrices and vectors.
+ //
  // Revision 1.1  2003/04/30 11:34:31  tisseran
  // Removee file no conform with Diemo's file hierarchy
***************
*** 29,36 ****
  // include header to make wrapper compile
  %{
! #include "@SDIF_INC_DIR@/sdif.h"
  %}
  
  
  // read all SDIF definitions
! %include "@SDIF_INC_DIR@/sdif.h"
--- 33,40 ----
  // include header to make wrapper compile
  %{
! #include "sdif.h"
  %}
  
  
  // read all SDIF definitions
! %include "sdif.h"

Index: easdif-common.i.in
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-common.i.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** easdif-common.i.in	5 Jan 2012 00:55:54 -0000	1.17
--- easdif-common.i.in	10 Apr 2014 21:34:07 -0000	1.18
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.18  2014/04/10 21:34:07  roebel
+ // More robust include file organisation.
+ // Extended types of vector that are supported to read from matrices and vectors.
+ //
  // Revision 1.17  2012/01/05 00:55:54  roebel
  // Provide access to FrameDirectory.
***************
*** 107,110 ****
--- 111,115 ----
  // include header to make wrapper compile
  %{
+ 
  #include "easdif/easdif.h"
  
***************
*** 175,197 ****
  }
  
! 
! %include "@EASDIF_INC_DIR@/easdif/sdif_matrix.hpp"
! %include "@EASDIF_INC_DIR@/easdif/sdifnamevaluetable.hpp"
! %include "@EASDIF_INC_DIR@/easdif/sdif_frame.hpp"
! %include "@EASDIF_INC_DIR@/easdif/sdifentity.hpp"
  
  %template(GetRow) Easdif::SDIFMatrix::GetRow<double>;
  %template(GetRow) Easdif::SDIFMatrix::GetRow<float>;
  %template(GetRow) Easdif::SDIFMatrix::GetRow<int>;
  %template(GetCol) Easdif::SDIFMatrix::GetCol<double>;
  %template(GetCol) Easdif::SDIFMatrix::GetCol<float>;
  %template(GetCol) Easdif::SDIFMatrix::GetCol<int>;
  
  %template(SetRow) Easdif::SDIFMatrix::SetRow<double>;
  %template(SetRow) Easdif::SDIFMatrix::SetRow<float>;
  %template(SetRow) Easdif::SDIFMatrix::SetRow<int>;
  %template(SetCol) Easdif::SDIFMatrix::SetCol<double>;
  %template(SetCol) Easdif::SDIFMatrix::SetCol<float>;
  %template(SetCol) Easdif::SDIFMatrix::SetCol<int>;
  
  
--- 180,223 ----
  }
  
! %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdif_matrix.hpp"
! %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdifnamevaluetable.hpp"
! %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdif_frame.hpp"
! %include "@EASDIF_INC_DIR_FOR_SWIG@/easdif/sdifentity.hpp"
  
  %template(GetRow) Easdif::SDIFMatrix::GetRow<double>;
  %template(GetRow) Easdif::SDIFMatrix::GetRow<float>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<char>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<short>;
  %template(GetRow) Easdif::SDIFMatrix::GetRow<int>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<unsigned char>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<unsigned short>;
+ %template(GetRow) Easdif::SDIFMatrix::GetRow<unsigned int>;
+ 
  %template(GetCol) Easdif::SDIFMatrix::GetCol<double>;
  %template(GetCol) Easdif::SDIFMatrix::GetCol<float>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<char>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<short>;
  %template(GetCol) Easdif::SDIFMatrix::GetCol<int>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<unsigned char>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<unsigned short>;
+ %template(GetCol) Easdif::SDIFMatrix::GetCol<unsigned int>;   
  
  %template(SetRow) Easdif::SDIFMatrix::SetRow<double>;
  %template(SetRow) Easdif::SDIFMatrix::SetRow<float>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<char>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<short>;
  %template(SetRow) Easdif::SDIFMatrix::SetRow<int>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<unsigned char>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<unsigned short>;
+ %template(SetRow) Easdif::SDIFMatrix::SetRow<unsigned int>;
+ 
  %template(SetCol) Easdif::SDIFMatrix::SetCol<double>;
  %template(SetCol) Easdif::SDIFMatrix::SetCol<float>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<char>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<short>;
  %template(SetCol) Easdif::SDIFMatrix::SetCol<int>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<unsigned char>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<unsigned short>;
+ %template(SetCol) Easdif::SDIFMatrix::SetCol<unsigned int>;
  
  

Index: easdif-defines.i
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/easdif-defines.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** easdif-defines.i	4 Mar 2008 02:08:39 -0000	1.2
--- easdif-defines.i	10 Apr 2014 21:34:07 -0000	1.3
***************
*** 6,9 ****
--- 6,13 ----
  //
  // $Log$
+ // Revision 1.3  2014/04/10 21:34:07  roebel
+ // More robust include file organisation.
+ // Extended types of vector that are supported to read from matrices and vectors.
+ //
  // Revision 1.2  2008/03/04 02:08:39  roebel
  // Define EASDIF_API to prevent swig errors.
***************
*** 25,35 ****
  
  typedef char           SdifChar;
  typedef short          SdifInt2;
- typedef unsigned short SdifUInt2;
  typedef int            SdifInt4;
  typedef unsigned int   SdifUInt4;
  typedef float          SdifFloat4;
  typedef double         SdifFloat8;
- typedef unsigned int   SdifSignature;
  
  
--- 29,42 ----
  
  typedef char           SdifChar;
+ typedef char           SdifInt1;
  typedef short          SdifInt2;
  typedef int            SdifInt4;
+ typedef unsigned char  SdifUInt1;
+ typedef unsigned short SdifUInt2;
  typedef unsigned int   SdifUInt4;
+ 
+ typedef unsigned int   SdifSignature;
  typedef float          SdifFloat4;
  typedef double         SdifFloat8;
  
  
***************
*** 42,48 ****
--- 49,57 ----
    eFloat4   = 0x0004,
    eFloat8   = 0x0008,
+   eInt1     = 0x0101,
    eInt2     = 0x0102,
    eInt4     = 0x0104,
    eInt8     = 0x0108,
+   eUInt1    = 0x0201,
    eUInt2    = 0x0202,
    eUInt4    = 0x0204,

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CMakeLists.txt	21 Mar 2014 23:56:41 -0000	1.10
--- CMakeLists.txt	10 Apr 2014 21:34:06 -0000	1.11
***************
*** 14,21 ****
    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/SDIF/include)
!   SET(EASDIF_INC_DIR ${CMAKE_SOURCE_DIR})
!   SET(SDIF_INC_DIR ${CMAKE_SOURCE_DIR})
!   SET(EASDIF_BUILDINC_DIR ${CMAKE_BINARY_DIR})
!   SET(SDIF_BUILDINC_DIR ${CMAKE_BINARY_DIR})
    CONFIGURE_FILE(easdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/easdif-common.i)
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
--- 14,21 ----
    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/SDIF/include)
!   SET(EASDIF_INC_DIR_FOR_SWIG ${CMAKE_CURRENT_SOURCE_DIR}/../)
!   SET(SDIF_INC_DIR_FOR_SWIG ${CMAKE_CURRENT_SOURCE_DIR}/../)
!   SET(EASDIF_BUILDINC_DIR ${CMAKE_CURRENT_BINARY_DIR}/../)
!   SET(SDIF_BUILDINC_DIR ${CMAKE_CURRENT_BINARY_DIR}/../)
    CONFIGURE_FILE(easdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/easdif-common.i)
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)

[Sdif-cvs] Easdif/swig CMakeLists.txt,1.9,1.10 README,1.8,1.9

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

Update of /cvsroot/sdif/Easdif/swig
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14665/swig

Modified Files:
	CMakeLists.txt README 
Log Message:
Support individal selection of swig interfaces

Index: README
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README	11 Dec 2006 22:07:04 -0000	1.8
--- README	21 Mar 2014 23:56:41 -0000	1.9
***************
*** 34,38 ****
  2. BUILDING
  
! currently three different languages (python perl, java) are supported,
  by means of copy pasting  the different configuration files in the sub
  directories new  bindings for other  languages are easy to  setup. the
--- 34,38 ----
  2. BUILDING
  
! currently three different languages (python, perl, java) are supported,
  by means of copy pasting  the different configuration files in the sub
  directories new  bindings for other  languages are easy to  setup. the
***************
*** 42,47 ****
  The cmake  build configuration  provides configurations for  all three
  targets (if the  required libraries and compilers are  avilable on the
! system).   The swig  interfaces  are configured  if  the cmake  option
! DOSWIG is set to ON during configuration and build system generation.
  
  Note, the  cmake build  system requires out  of source  building. This
--- 42,49 ----
  The cmake  build configuration  provides configurations for  all three
  targets (if the  required libraries and compilers are  avilable on the
! system).   The swig  interfaces  are configured  if the  corresponding
! cmake option DO_YYY (with YYY set to  PYTHON, PERL, or JAVA) is set to
! ON during configuration and build system generation. Multiple swig
! interface targets can be enabled at the same time.
  
  Note, the  cmake build  system requires out  of source  building. This
***************
*** 52,56 ****
  
  > # configuration
! > cmake PATH_TO_EASDIF_SRC_DIR -DDOSWIG=ON 
  
  # build swig interface (example for python)
--- 54,58 ----
  
  > # configuration
! > cmake PATH_TO_EASDIF_SRC_DIR -DDO_PYTHON:BOOL=ON 
  
  # build swig interface (example for python)
***************
*** 69,72 ****
--- 71,75 ----
  command. For more info on cmake look at www.cmake.org.
  
+ 
  GNU autoools configure
  

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CMakeLists.txt	5 Jan 2012 00:36:26 -0000	1.9
--- CMakeLists.txt	21 Mar 2014 23:56:41 -0000	1.10
***************
*** 21,36 ****
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
  
!   IF(NOT SWIG_NO_PYTHON)
      MESSAGE(STATUS "python")
      ADD_SUBDIRECTORY(python)
!   ENDIF(NOT SWIG_NO_PYTHON)
!   IF(NOT SWIG_NO_PERL)
      MESSAGE(STATUS "perl5")
      ADD_SUBDIRECTORY(perl5)
!   ENDIF(NOT SWIG_NO_PERL)
!   IF(NOT SWIG_NO_JAVA)
      MESSAGE(STATUS "java")
      ADD_SUBDIRECTORY(java)
!   ENDIF(NOT SWIG_NO_JAVA)
  
  ENDIF(SWIG_FOUND)
--- 21,36 ----
    CONFIGURE_FILE(sdif-common.i.in ${CMAKE_CURRENT_BINARY_DIR}/sdif-common.i)
  
!   IF(DO_PYTHON)
      MESSAGE(STATUS "python")
      ADD_SUBDIRECTORY(python)
!   ENDIF(DO_PYTHON)
!   IF(DO_PERL)
      MESSAGE(STATUS "perl5")
      ADD_SUBDIRECTORY(perl5)
!   ENDIF(DO_PERL)
!   IF(DO_JAVA)
      MESSAGE(STATUS "java")
      ADD_SUBDIRECTORY(java)
!   ENDIF(DO_JAVA)
  
  ENDIF(SWIG_FOUND)

[Sdif-cvs] SDIF/cmModules SET_COMPILER_FLAGS.cmake,1.1,1.2

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

Update of /cvsroot/sdif/SDIF/cmModules
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13766

Modified Files:
	SET_COMPILER_FLAGS.cmake 
Log Message:
Support clang compiler on Darwin.


Index: SET_COMPILER_FLAGS.cmake
===================================================================
RCS file: /cvsroot/sdif/SDIF/cmModules/SET_COMPILER_FLAGS.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SET_COMPILER_FLAGS.cmake	12 Jul 2011 10:47:17 -0000	1.1
--- SET_COMPILER_FLAGS.cmake	21 Mar 2014 23:41:49 -0000	1.2
***************
*** 40,44 ****
        ENDIF(${ARCH_IS_32BIT} AND "${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
      ENDIF(NOT APPLE)
!     IF(NOT WIN32)
        INCLUDE( CheckCXXCompilerFlag)      
        CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" GCC_HAS_VISIBILITY)
--- 40,44 ----
        ENDIF(${ARCH_IS_32BIT} AND "${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
      ENDIF(NOT APPLE)
!     IF(NOT GCC_VISIBILITY_DEFAULT AND NOT WIN32)
        INCLUDE( CheckCXXCompilerFlag)      
        CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" GCC_HAS_VISIBILITY)
***************
*** 46,50 ****
          ADD_COMPILER_FLAGS(-DGCC_HAS_VISIBILITY -fvisibility=hidden)
        ENDIF(GCC_HAS_VISIBILITY)
!     ENDIF(NOT WIN32)
      INCLUDE(GET_GCC_VERSION)
      ADD_BT_COMPILER_FLAGS(DEBUG -Wall -Wno-switch -Wno-unused-function -O0 -fno-inline )
--- 46,50 ----
          ADD_COMPILER_FLAGS(-DGCC_HAS_VISIBILITY -fvisibility=hidden)
        ENDIF(GCC_HAS_VISIBILITY)
!     ENDIF(NOT GCC_VISIBILITY_DEFAULT AND NOT WIN32)
      INCLUDE(GET_GCC_VERSION)
      ADD_BT_COMPILER_FLAGS(DEBUG -Wall -Wno-switch -Wno-unused-function -O0 -fno-inline )
***************
*** 81,87 ****
        ENDIF(GCCVERSIONMAJ EQUAL 4)
      ENDIF (GCCVERSIONMAJ EQUAL 3)    
    ENDIF(CMAKE_COMPILER_IS_GNUCC)
  
!   IF (APPLE)
       IF("${ARCH}" MATCHES ^p.*)
      #   ADD_ARCH_FLAGS(ppc970 -mcpu=970 -mpowerpc64 -mpowerpc-gpopt -mtune=970  -falign-loops=32 -falign-jumps=32 )
--- 81,109 ----
        ENDIF(GCCVERSIONMAJ EQUAL 4)
      ENDIF (GCCVERSIONMAJ EQUAL 3)    
+   ELSE(CMAKE_COMPILER_IS_GNUCC)
+     IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+       IF(NOT GCC_VISIBILITY_DEFAULT)
+         ADD_COMPILER_FLAGS(-DGCC_HAS_VISIBILITY -fvisibility=hidden)
+       ENDIF(NOT GCC_VISIBILITY_DEFAULT)
+       IF(USE_LLVM_STD)
+         ADD_BT_COMPILER_CXXFLAGS(BASE -stdlib=libc++)
+       ELSE(USE_LLVM_STD)
+         ADD_BT_COMPILER_CXXFLAGS(BASE -stdlib=libstdc++)
+       ENDIF(USE_LLVM_STD)
+       IF(${ARCH}  STREQUAL "x86_64")
+         ADD_COMPILER_FLAGS(-fno-strict-aliasing)
+       ELSE(${ARCH}  STREQUAL "x86_64")
+         ADD_COMPILER_FLAGS(-fstrict-aliasing)
+       ENDIF(${ARCH}  STREQUAL "x86_64")
+       ADD_BT_COMPILER_FLAGS(DEBUG -Wall -Wno-switch -Wno-unused-function -Wno-mismatched-tags -O0 -fno-inline )
+       ADD_BT_COMPILER_FLAGS(RELEASE -funroll-loops -Wall -Wno-switch -Wno-unused-function -Wstrict-overflow=0 -Wno-mismatched-tags)
+       ADD_BT_COMPILER_FLAGS(RELWITHDEBINFO -funroll-loops  -Wall -Wno-switch -Wno-unused-function -fno-inline -Wstrict-overflow=0 -Wno-mismatched-tags)
+       IF(GENERATE_PIE)
+         SET(NOPIC_FLAGS "-fPIE")
+       ENDIF(GENERATE_PIE)
+     ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    ENDIF(CMAKE_COMPILER_IS_GNUCC)
  
!   IF (APPLE AND CMAKE_COMPILER_IS_GNUCC)
       IF("${ARCH}" MATCHES ^p.*)
      #   ADD_ARCH_FLAGS(ppc970 -mcpu=970 -mpowerpc64 -mpowerpc-gpopt -mtune=970  -falign-loops=32 -falign-jumps=32 )
***************
*** 90,96 ****
      #   ADD_ARCH_FLAGS(powerpc -mpowerpc )
       ELSE("${ARCH}" MATCHES ^p.*)
!       ADD_COMPILER_FLAGS( -maccumulate-outgoing-args  )
      ENDIF("${ARCH}" MATCHES ^p.*)
!   ENDIF(APPLE)
  
    IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
--- 112,120 ----
      #   ADD_ARCH_FLAGS(powerpc -mpowerpc )
       ELSE("${ARCH}" MATCHES ^p.*)
!       IF(NOT "${ARCH}" MATCHES ^arm.*)
!         ADD_COMPILER_FLAGS( -maccumulate-outgoing-args  )
!       ENDIF(NOT "${ARCH}" MATCHES ^arm.*)
      ENDIF("${ARCH}" MATCHES ^p.*)
!   ENDIF(APPLE AND CMAKE_COMPILER_IS_GNUCC)
  
    IF ( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")

[Sdif-cvs] SDIF configure.in,1.84,1.85 Makefile.am,1.38,1.39

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5311

Modified Files:
	configure.in Makefile.am 
Log Message:
add iosbuild to dist


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sdif/SDIF/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Makefile.am	19 Oct 2009 17:02:02 -0000	1.38
--- Makefile.am	16 Jul 2013 11:41:33 -0000	1.39
***************
*** 31,34 ****
--- 31,37 ----
  
  # $Log$
+ # Revision 1.39  2013/07/16 11:41:33  diemo
+ # add iosbuild to dist
+ #
  # Revision 1.38  2009/10/19 17:02:02  diemo
  # new upload host and dir, again
***************
*** 194,198 ****
  SUBDIRS = sdif include tools data examples test $(SDIF_CPP_DIR) macosxbuild $(DOC_SRC_DIR)
  
! DIST_SUBDIRS = sdif include tools data examples test  macosxbuild doc sdifcpp cmModules
  
  sdifincdir = @top_srcdir@/include
--- 197,201 ----
  SUBDIRS = sdif include tools data examples test $(SDIF_CPP_DIR) macosxbuild $(DOC_SRC_DIR)
  
! DIST_SUBDIRS = sdif include tools data examples test  macosxbuild iosbuild doc sdifcpp cmModules
  
  sdifincdir = @top_srcdir@/include

Index: configure.in
===================================================================
RCS file: /cvsroot/sdif/SDIF/configure.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** configure.in	16 Jul 2013 11:26:53 -0000	1.84
--- configure.in	16 Jul 2013 11:41:33 -0000	1.85
***************
*** 32,35 ****
--- 32,38 ----
  
  dnl $Log$
+ dnl Revision 1.85  2013/07/16 11:41:33  diemo
+ dnl add iosbuild to dist
+ dnl
  dnl Revision 1.84  2013/07/16 11:26:53  diemo
  dnl v3.11.5
***************
*** 664,667 ****
--- 667,672 ----
  macosxbuild/Makefile
  macosxbuild/SDIF.xcodeproj/Makefile
+ iosbuild/Makefile
+ iosbuild/SDIF-lib-ios.xcodeproj/Makefile
  cmModules/Makefile
  sdif.pc 

[Sdif-cvs] SDIF/macosxbuild/SDIF.xcodeproj Makefile.am,1.1,1.2

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/macosxbuild/SDIF.xcodeproj
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5311/macosxbuild/SDIF.xcodeproj

Modified Files:
	Makefile.am 
Log Message:
add iosbuild to dist


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sdif/SDIF/macosxbuild/SDIF.xcodeproj/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	18 Feb 2009 14:02:57 -0000	1.1
--- Makefile.am	16 Jul 2013 11:41:33 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
  #
  # $Log$
+ # Revision 1.2  2013/07/16 11:41:33  diemo
+ # add iosbuild to dist
+ #
  # Revision 1.1  2009/02/18 14:02:57  diemo
  # empty makefile just to include Mac xcode compilation project in source distribution
***************
*** 17,19 ****
  
  all:
! 		echo "Use Apple ProjectBuilder to build for Mac OS X"
--- 20,22 ----
  
  all:
! 		echo "Use Xcode to build for Mac OS X"

[Sdif-cvs] SDIF ChangeLog, 1.65, 1.66 ReleaseNotes, 3.12, 3.13 configure.in, 1.83, 1.84

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4660

Modified Files:
	ChangeLog ReleaseNotes configure.in 
Log Message:
v3.11.5


Index: ReleaseNotes
===================================================================
RCS file: /cvsroot/sdif/SDIF/ReleaseNotes,v
retrieving revision 3.12
retrieving revision 3.13
diff -C2 -d -r3.12 -r3.13
*** ReleaseNotes	5 Mar 2013 13:58:51 -0000	3.12
--- ReleaseNotes	16 Jul 2013 11:26:53 -0000	3.13
***************
*** 1,2 ****
--- 1,19 ----
+ Version 3.11.5	2013-07-16  Diemo Schwarz 
+ 
+ 	* iosbuild/SDIF-lib-ios.xcodeproj
+ 	static lib build project for ios
+ 
+ 	* sdif/host_architecture.h: add detection of iOS
+ 
+ 	* tools/sdifextract.c:
+ 	with option -l, output text matrices as labels in bpf mode
+ 
+ 	* test/cmd_testcheck:
+ 	proper numeric error val check: all tests pass now
+ 
+ 	* include/sdif.h.in, sdif/SdifFile.c, sdif/SdifHard_OS.c, sdif/host_architecture.h, sdif/sdif_portability.h, tools/sdifextract.c:
+ 	Base selection of WIN32 specific implementation on definition of macros  WIN32 OR _WIN32. The latter being standard in
+ 	Visual C++ it is most important to have it.
+ 
  Version 3.11.4	2011-12-19  Axel Roebel
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sdif/SDIF/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** ChangeLog	19 Dec 2011 17:48:10 -0000	1.65
--- ChangeLog	16 Jul 2013 11:26:53 -0000	1.66
***************
*** 1,2 ****
--- 1,59 ----
+ 2013-07-16  diemo  <di...@m1...>
+ Version 3.11.5
+ 	
+ 	* sdif/config.h.in: as generated by autotools 2.63
+ 
+ 	* sdif/host_architecture.h: add detection of iOS and android (untested)
+ 
+ 	* test/cmd_testcheck: print prog and err code
+ 
+ 	* test/cmd_testcheck: erm, correct check
+ 
+ 	* test/cmd_testcheck:
+ 	proper numeric error val check: all tests pass now
+ 
+ 	* sdif/SdifPrint.c, sdif/sdif_portability.h:
+ 	use quotes for local includes
+ 
+ 2013-06-17  diemo  <di...@m1...>
+ 
+ 	* tools/sdifextract.c:
+ 	with option -l, output text matrices as labels in bpf mode
+ 
+ 2013-03-08  diemo  <di...@m1...>
+ 
+ 	* iosbuild/SDIF-lib-ios.xcodeproj/project.pbxproj:
+ 	fix project after move
+ 
+ 	* iosbuild/SDIF-lib-ios-Prefix.pch:
+ 	add prefix file necessary for compilation
+ 
+ 	* iosbuild/SDIF-lib-ios.xcodeproj/project.pbxproj:
+ 	static lib build project for ios
+ 
+ 2013-03-05  diemo  <di...@m1...>
+ 
+ 	* macosxbuild/SDIF.xcodeproj/project.pbxproj, macosxbuild/Info.plist:
+ 	update version number
+ 
+ 	* ReleaseNotes: v3.11.4
+ 
+ 2012-03-30  diemo  <di...@m1...>
+ 
+ 	* configure.in: fix
+ 
+ 	configure: error: conditional "am__fastdepCXX" was never defined.
+ 	Usually this means the macro was only invoked conditionally.
+ 
+ 	this macro must not be in a conditional, according to
+ 	http://osdir.com/ml/libtool-gnu/2010-05/msg00041.html
+ 
+ 2012-01-02  roebel  <ro...@m1...>
+ 
+ 	* include/sdif.h.in, sdif/SdifFile.c, sdif/SdifHard_OS.c, sdif/host_architecture.h, sdif/sdif_portability.h, tools/sdifextract.c:
+ 	Base selection of WIN32 specific implementation on definition of macros  WIN32 OR _WIN32. The latter being standard in
+ 	Visual C++ it is most important to have it.
+ 
+ 
  2011-12-19  Axel Roebel  <ro...@m1...>
  Version 3.11.4

Index: configure.in
===================================================================
RCS file: /cvsroot/sdif/SDIF/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** configure.in	30 Mar 2012 11:10:30 -0000	1.83
--- configure.in	16 Jul 2013 11:26:53 -0000	1.84
***************
*** 32,35 ****
--- 32,38 ----
  
  dnl $Log$
+ dnl Revision 1.84  2013/07/16 11:26:53  diemo
+ dnl v3.11.5
+ dnl
  dnl Revision 1.83  2012/03/30 11:10:30  diemo
  dnl fix
***************
*** 357,361 ****
  SDIF_VERSION_MAJOR=3
  SDIF_VERSION_MINOR=11
! SDIF_VERSION_RELEASE=4
  
  VERSION=$SDIF_VERSION_MAJOR.$SDIF_VERSION_MINOR.$SDIF_VERSION_RELEASE
--- 360,364 ----
  SDIF_VERSION_MAJOR=3
  SDIF_VERSION_MINOR=11
! SDIF_VERSION_RELEASE=5
  
  VERSION=$SDIF_VERSION_MAJOR.$SDIF_VERSION_MINOR.$SDIF_VERSION_RELEASE

[Sdif-cvs] SDIF/sdif config.h.in,1.10,1.11

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/sdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4338/sdif

Modified Files:
	config.h.in 
Log Message:
as generated by autotools 2.63


Index: config.h.in
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/config.h.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.h.in	6 Oct 2008 09:28:53 -0000	1.10
--- config.h.in	16 Jul 2013 11:18:40 -0000	1.11
***************
*** 1,4 ****
--- 1,7 ----
  /* sdif/config.h.in.  Generated from configure.in by autoheader.  */
  
+ /* Define if building universal (internal helper macro) */
+ #undef AC_APPLE_UNIVERSAL_BUILD
+ 
  /* Define to 1 if you have the <dlfcn.h> header file. */
  #undef HAVE_DLFCN_H
***************
*** 37,43 ****
  #undef HAVE_SYS_STAT_H
  
- /* Define to 1 if you are on Mac OSX and have the <machine/endian.h> header file. */
- #undef HAVE_MACHINE_ENDIAN_H
- 
  /* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H
--- 40,43 ----
***************
*** 46,49 ****
--- 46,53 ----
  #undef HAVE_UNISTD_H
  
+ /* Define to the sub-directory in which libtool stores uninstalled libraries.
+    */
+ #undef LT_OBJDIR
+ 
  /* Name of package */
  #undef PACKAGE
***************
*** 68,74 ****
  #undef PTHREAD_CREATE_JOINABLE
  
! /* The size of a `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
--- 72,99 ----
  #undef PTHREAD_CREATE_JOINABLE
  
! /* The size of `INT64', as computed by sizeof. */
! #undef SIZEOF_INT64
! 
! /* The size of `int64_t', as computed by sizeof. */
! #undef SIZEOF_INT64_T
! 
! /* The size of `loff_t', as computed by sizeof. */
! #undef SIZEOF_LOFF_T
! 
! /* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  
+ /* The size of `long long', as computed by sizeof. */
+ #undef SIZEOF_LONG_LONG
+ 
+ /* The size of `off64_t', as computed by sizeof. */
+ #undef SIZEOF_OFF64_T
+ 
+ /* The size of `off_t', as computed by sizeof. */
+ #undef SIZEOF_OFF_T
+ 
+ /* The size of `__int64', as computed by sizeof. */
+ #undef SIZEOF___INT64
+ 
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
***************
*** 77,81 ****
  #undef VERSION
  
! /* Define to 1 if your processor stores words with the most significant byte
!    first (like Motorola and SPARC, unlike Intel and VAX). */
! #undef WORDS_BIGENDIAN
--- 102,114 ----
  #undef VERSION
  
! /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
!    significant byte first (like Motorola and SPARC, unlike Intel). */
! #if defined AC_APPLE_UNIVERSAL_BUILD
! # if defined __BIG_ENDIAN__
! #  define WORDS_BIGENDIAN 1
! # endif
! #else
! # ifndef WORDS_BIGENDIAN
! #  undef WORDS_BIGENDIAN
! # endif
! #endif

[Sdif-cvs] SDIF/sdif host_architecture.h,3.3,3.4

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/sdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4107/sdif

Modified Files:
	host_architecture.h 
Log Message:
add detection of iOS and android (untested)


Index: host_architecture.h
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/host_architecture.h,v
retrieving revision 3.3
retrieving revision 3.4
diff -C2 -d -r3.3 -r3.4
*** host_architecture.h	2 Jan 2012 23:49:08 -0000	3.3
--- host_architecture.h	16 Jul 2013 11:13:10 -0000	3.4
***************
*** 14,20 ****
    HOST_ARCH_n86         - Current architecture is Intel (3|4)86, Pentium/K5 (586), 
                                                          or Pentium II (686)
  
!   HOST_OS_UNIX          - Generated code will run under Unix
!   HOST_OS_MAC           - Generated code will run under Mac OS
    HOST_OS_WIN32         - Generated code will run under 32-bit Windows
                          
--- 14,23 ----
    HOST_ARCH_n86         - Current architecture is Intel (3|4)86, Pentium/K5 (586), 
                                                          or Pentium II (686)
+   HOST_ARCH_ARMv7	- Current architecture is ARM as in iPhone/iPad
  
!   HOST_OS_UNIX          - Generated code will run under Unix or Mac OSX
!   HOST_OS_MAC           - Generated code will run under Mac OS 9
!   HOST_OS_IOS           - Generated code will run under iOS
!   HOST_OS_ANDROID       - Generated code will run under Android
    HOST_OS_WIN32         - Generated code will run under 32-bit Windows
                          
***************
*** 43,46 ****
--- 46,52 ----
  
    $Log$
+   Revision 3.4  2013/07/16 11:13:10  diemo
+   add detection of iOS and android (untested)
+ 
    Revision 3.3  2012/01/02 23:49:08  roebel
    Base selection of WIN32 specific implementation on definition of macros  WIN32 OR _WIN32. The latter being standard in
***************
*** 150,158 ****
  #     define HOST_ARCH_X86                              1
  
  #endif
  
  
  /*===========================================================================*/
! /* UNIX */
  
  #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__MACH__)
--- 156,168 ----
  #     define HOST_ARCH_X86                              1
  
+ #elif defined(__arm__)
+ 
+ #     define HOST_ARCH_ARMv7				1
+ 
  #endif
  
  
  /*===========================================================================*/
! /* UNIX (includes Apple Mac OSX and iOS)*/
  
  #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__MACH__)
***************
*** 183,187 ****
  #   define HOST_ENDIAN_BIG  1
  #   define WORDS_BIGENDIAN  1
! #elif HOST_ARCH_ALPHA || HOST_ARCH_X86
  #   define HOST_ENDIAN_LITTLE  1
  #   undef  WORDS_BIGENDIAN
--- 193,197 ----
  #   define HOST_ENDIAN_BIG  1
  #   define WORDS_BIGENDIAN  1
! #elif HOST_ARCH_ALPHA || HOST_ARCH_X86 || HOST_ARCH_ARMv7
  #   define HOST_ENDIAN_LITTLE  1
  #   undef  WORDS_BIGENDIAN
***************
*** 207,211 ****
  
  /*===========================================================================*/
! /* MACINTOSH */
  
  #elif defined(macintosh)
--- 217,221 ----
  
  /*===========================================================================*/
! /* MACINTOSH OS 9 */
  
  #elif defined(macintosh)
***************
*** 241,244 ****
--- 251,263 ----
  
  
+ 
+ /*===========================================================================*/
+ /* Android */
+ 
+ #elif defined(__ANDROID__)
+ 
+ #define HOST_OS_ANDROID					1
+ 
+ 
  /*===========================================================================*/
  /* WINDOWS */

[Sdif-cvs] SDIF/test cmd_testcheck,1.8,1.9

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/test
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3638

Modified Files:
	cmd_testcheck 
Log Message:
print prog and err code


Index: cmd_testcheck
===================================================================
RCS file: /cvsroot/sdif/SDIF/test/cmd_testcheck,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cmd_testcheck	16 Jul 2013 10:42:57 -0000	1.8
--- cmd_testcheck	16 Jul 2013 11:00:43 -0000	1.9
***************
*** 31,37 ****
  fi
  
  $QUERYPROG $FILE
! if [ $? -ne 0 ] ; then
!   echo querysdif returns error $? for $FILE.
    exit 1;
  fi
--- 31,41 ----
  fi
  
+ echo Running $QUERYPROG ${FILE}:
+ echo
+ 
  $QUERYPROG $FILE
! err=$?
! if [ $err -ne 0 ] ; then
!   echo querysdif returns error $err for $FILE.
    exit 1;
  fi

[Sdif-cvs] SDIF/test cmd_testcheck,1.7,1.8

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/test
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2974

Modified Files:
	cmd_testcheck 
Log Message:
erm, correct check


Index: cmd_testcheck
===================================================================
RCS file: /cvsroot/sdif/SDIF/test/cmd_testcheck,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cmd_testcheck	16 Jul 2013 10:27:27 -0000	1.7
--- cmd_testcheck	16 Jul 2013 10:42:57 -0000	1.8
***************
*** 32,37 ****
  
  $QUERYPROG $FILE
! if [ $? -eq 0 ] ; then
!   echo querysdif returns an error for $FILE.
    exit 1;
  fi
--- 32,37 ----
  
  $QUERYPROG $FILE
! if [ $? -ne 0 ] ; then
!   echo querysdif returns error $? for $FILE.
    exit 1;
  fi

[Sdif-cvs] SDIF/test cmd_testcheck,1.6,1.7

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/test
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2313/test

Modified Files:
	cmd_testcheck 
Log Message:
proper numeric error val check: all tests pass now


Index: cmd_testcheck
===================================================================
RCS file: /cvsroot/sdif/SDIF/test/cmd_testcheck,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cmd_testcheck	12 Apr 2011 14:19:32 -0000	1.6
--- cmd_testcheck	16 Jul 2013 10:27:27 -0000	1.7
***************
*** 32,36 ****
  
  $QUERYPROG $FILE
! if [ "$?" != "0" ] ; then
    echo querysdif returns an error for $FILE.
    exit 1;
--- 32,36 ----
  
  $QUERYPROG $FILE
! if [ $? -eq 0 ] ; then
    echo querysdif returns an error for $FILE.
    exit 1;

[Sdif-cvs] SDIF/sdif sdif_portability.h, 3.5, 3.6 SdifPrint.c, 3.12, 3.13

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/sdif
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2257/sdif

Modified Files:
	sdif_portability.h SdifPrint.c 
Log Message:
use quotes for local includes


Index: sdif_portability.h
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/sdif_portability.h,v
retrieving revision 3.5
retrieving revision 3.6
diff -C2 -d -r3.5 -r3.6
*** sdif_portability.h	2 Jan 2012 23:49:08 -0000	3.5
--- sdif_portability.h	16 Jul 2013 10:26:13 -0000	3.6
***************
*** 34,37 ****
--- 34,40 ----
   * LOG
   * $Log$
+  * Revision 3.6  2013/07/16 10:26:13  diemo
+  * use quotes for local includes
+  *
   * Revision 3.5  2012/01/02 23:49:08  roebel
   * Base selection of WIN32 specific implementation on definition of macros  WIN32 OR _WIN32. The latter being standard in
***************
*** 73,77 ****
  #define __H_SDIF_PORTABILITY__
  
! #include <sdif_version.h>
  
  #if defined( _WIN32) || defined(WIN32)
--- 76,80 ----
  #define __H_SDIF_PORTABILITY__
  
! #include "sdif_version.h"
  
  #if defined( _WIN32) || defined(WIN32)

Index: SdifPrint.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/SdifPrint.c,v
retrieving revision 3.12
retrieving revision 3.13
diff -C2 -d -r3.12 -r3.13
*** SdifPrint.c	26 Nov 2007 18:51:12 -0000	3.12
--- SdifPrint.c	16 Jul 2013 10:26:13 -0000	3.13
***************
*** 34,37 ****
--- 34,40 ----
   *
   * $Log$
+  * Revision 3.13  2013/07/16 10:26:13  diemo
+  * use quotes for local includes
+  *
   * Revision 3.12  2007/11/26 18:51:12  roebel
   * Changed data types to have less casts and
***************
*** 92,96 ****
  
  
! #include <sdif.h>
  #include "sdif_portability.h"
  
--- 95,99 ----
  
  
! #include "sdif.h"
  #include "sdif_portability.h"
  

[Sdif-cvs] SDIF/tools sdifextract.c,1.18,1.19

[Diemo S. <di...@us...>]

Update of /cvsroot/sdif/SDIF/tools
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13356

Modified Files:
	sdifextract.c 
Log Message:
with option -l, output text matrices as labels in bpf mode


Index: sdifextract.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/tools/sdifextract.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** sdifextract.c	2 Jan 2012 23:49:08 -0000	1.18
--- sdifextract.c	17 Jun 2013 16:30:19 -0000	1.19
***************
*** 14,17 ****
--- 14,20 ----
     
     $Log$
+    Revision 1.19  2013/06/17 16:30:19  diemo
+    with option -l, output text matrices as labels in bpf mode
+ 
     Revision 1.18  2012/01/02 23:49:08  roebel
     Base selection of WIN32 specific implementation on definition of macros  WIN32 OR _WIN32. The latter being standard in
***************
*** 204,207 ****
--- 207,212 ----
  void outsdif   (OutAction what, double data);
  void outbpf    (OutAction what, double data);
+ void outbpf_text   (OutAction what, double data);
+ void outbpf_number (OutAction what, double data);
  void outtime   (OutAction what, double data);
  void outdata   (OutAction what, double data);
***************
*** 218,221 ****
--- 223,227 ----
  int	       verb     = 0;	/* verbosity: -1=quiet, 0=normal, 1=verbose */
  int	       force    = 0;	/* allow iffy selections */
+ int	       textout  = 0;	/* output text matrices as labels */
  char	       *types   = NULL;
  SdifFileT      *in      = NULL;
***************
*** 268,271 ****
--- 274,279 ----
  "	-v		      be verbose\n"
  "	-q		      be quiet\n"
+ "	-l		      output text matrices as labels in bpf mode\n"
+ "	-F		      allow SDIF output to stdout\n"
  "	-h		      short help\n"
  "	-help		      long help, prints sdif types if -T given,\n"
***************
*** 303,307 ****
  "	one column, the output file can be used as a break-point-function.\n"
  "\n"
! "-format In the ASCII .format file format (as used with additive),\n"
  "	each matrix is printed in the format:\n"
  "\n"
--- 311,315 ----
  "	one column, the output file can be used as a break-point-function.\n"
  "\n"
! "-format In the ASCII .format file format (as used with additive or Pm),\n"
  "	each matrix is printed in the format:\n"
  "\n"
***************
*** 467,475 ****
  
  
  void 
  outbpf (OutAction what, double data)
  {
-     static FILE	  *out = NULL;
      static double time = -1;
  
      switch (what)
--- 475,486 ----
  
  
+ // output file for outbpf_* functions
+ static FILE	  *out = NULL;
+ 
  void 
  outbpf (OutAction what, double data)
  {
      static double time = -1;
+     static void (*outmatrix) (OutAction what, double data);
  
      switch (what)
***************
*** 487,503 ****
  
  	case BeginFrame:    time = data;			break;
- 			    
- 	case BeginMatrix:   
- 	case EndMatrix:     
  	case EndFrame:	    
  	default:	    /* do nothing */			break;
  			    
! 	case BeginRow:	    fprintf (out, "%f\t", time);	break;
  	case InRow:	    fprintf (out, "%10f\t", data);	break;
  	case EndRow:	    fprintf (out, "\n");		break;
! 	case CloseFile:	    fclose (out);			break;
      }
  }
  
  
  
--- 498,554 ----
  
  	case BeginFrame:    time = data;			break;
  	case EndFrame:	    
  	default:	    /* do nothing */			break;
  			    
! 	case BeginMatrix:   outmatrix = (textout  &&  SdifFCurrDataType (in) == eText  
! 					 ?  outbpf_text  :  outbpf_number);
! 			    /*FALLTHROUGH*/
! 	case EndMatrix:     
! 	case BeginRow:	    outmatrix(what, time);		break;
! 
! 	case InRow:	    
! 	case EndRow:	    outmatrix(what, data);		break;   
! 
! 	case CloseFile:	    fclose (out);			break;
!     }
! }
! 
! void 
! outbpf_number (OutAction what, double data)
! {
!     switch (what)
!     {
! 	case BeginRow:	    fprintf (out, "%f\t", data);	break;
  	case InRow:	    fprintf (out, "%10f\t", data);	break;
  	case EndRow:	    fprintf (out, "\n");		break;
! 	default:	    /* do nothing */			break;
      }
  }
  
+ void 
+ outbpf_text (OutAction what, double data)
+ {
+     static char   *textbuf = NULL;
+     static int	  textptr;
+ 
+     switch (what)
+     {
+ 	case BeginMatrix: 
+ 	    fprintf (out, "%f\t", data);
+ 	    textbuf = (char *) realloc(textbuf, SdifFCurrNbRow (in));
+ 	    textptr = 0;
+ 	break;
+ 
+ 	case EndMatrix:     
+ 	    fprintf (out, "%s\n", textbuf);	
+ 	break;
+ 
+ 	case InRow:
+ 	    textbuf[textptr++] = data;
+ 	break;
+ 
+ 	default:	    /* do nothing */			break;
+     }
+ }
  
  
***************
*** 531,535 ****
  	case InRow:	    fprintf (out, "%10f\t", data);	break;
  	case EndRow:	    fprintf (out, "\n");		break;
- 	case CloseFile:	    fclose (out);			break;
      }
  }
--- 582,585 ----
***************
*** 685,689 ****
  	    else
  	    {	/* do short args */
! #		define boolopt  "hqvF"	/* flags with no arguments */
  		if (i == argc - 1  &&  !strchr (boolopt, argv [i][1]))
  		    /* no arg after last option, complain */
--- 735,739 ----
  	    else
  	    {	/* do short args */
! #		define boolopt  "hqvFl"	/* flags with no arguments */
  		if (i == argc - 1  &&  !strchr (boolopt, argv [i][1]))
  		    /* no arg after last option, complain */
***************
*** 715,718 ****
--- 765,769 ----
  	      	    case 'T':  types     = argv [++i];			 break;
  	      	    case 'F':  force     =  1;				 break;
+ 	      	    case 'l':  textout   =  1;				 break;
  	      	    case 'q':  verb	 = -1;			   	 break;
  	      	    case 'v':  verb	 =  1;			   	 break;