You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(24) |
Nov
(48) |
Dec
(106) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(2) |
Feb
(3) |
Mar
(5) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(3) |
Oct
(10) |
Nov
(52) |
Dec
(12) |
2008 |
Jan
(56) |
Feb
(14) |
Mar
(19) |
Apr
(19) |
May
(12) |
Jun
(5) |
Jul
(6) |
Aug
|
Sep
(39) |
Oct
(1) |
Nov
|
Dec
(11) |
2009 |
Jan
(17) |
Feb
(11) |
Mar
|
Apr
(10) |
May
|
Jun
|
Jul
(5) |
Aug
(15) |
Sep
|
Oct
(19) |
Nov
(2) |
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(13) |
May
|
Jun
(8) |
Jul
(3) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(4) |
2012 |
Jan
(25) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
|
Jun
(1) |
Jul
(9) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
(2) |
Apr
(4) |
May
(11) |
Jun
(2) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(2) |
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Axel R. <ro...@us...> - 2017-03-20 21:35:05
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19194 Modified Files: CMakeLists.txt Log Message: Give proper error message if numpy is not available. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CMakeLists.txt 11 Mar 2017 09:15:06 -0000 1.24 --- CMakeLists.txt 20 Mar 2017 21:35:03 -0000 1.25 *************** *** 21,24 **** --- 21,27 ---- EXECUTE_PROCESS(COMMAND ${PYTHON} -c "from __future__ import print_function\nimport numpy\nif hasattr(numpy,'get_include'):\n ss=numpy.get_include()\nelse: ss=numpy.get_numpy_include()\nprint(ss)" OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE) + if ( out STREQUAL "" ) + MESSAGE(FATAL_ERROR "EASDIF Python interface :: Cannot determine NUMPY includes") + endif ( out STREQUAL "" ) STRING(REGEX REPLACE "[ \t]+" ";" NUMPY_INC_HINT ${out}) MESSAGE("NUMPY_INC_HINT ${NUMPY_INC_HINT}") |
From: Axel R. <ro...@us...> - 2017-03-16 19:46:28
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13527 Modified Files: sdiftypemap-python.i Log Message: Removed remaining debug output. Index: sdiftypemap-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/sdiftypemap-python.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** sdiftypemap-python.i 15 Mar 2017 10:54:34 -0000 1.8 --- sdiftypemap-python.i 16 Mar 2017 19:46:25 -0000 1.9 *************** *** 6,9 **** --- 6,12 ---- // // $Log$ + // Revision 1.9 2017/03/16 19:46:25 roebel + // Removed remaining debug output. + // // Revision 1.8 2017/03/15 10:54:34 roebel // Summary: Version 1.4.25 - Python 3 fix *************** *** 45,51 **** { %#if PY_MAJOR_VERSION < 3 - fprintf(stderr,"StringCheck %d\n",PyString_Check($input)); - if(PyString_Check($input)) - fprintf(stderr,"StringSize %ld\n",PyString_Size($input)); if (PyString_Check($input) && (PyString_Size($input) == 4)) { --- 48,51 ---- |
From: Axel R. <ro...@us...> - 2017-03-15 10:54:37
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30563/swig/python Modified Files: sdiftypemap-python.i Log Message: Summary: Version 1.4.25 - Python 3 fix Fixed typemap for converting strings into sdif signatures. Index: sdiftypemap-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/sdiftypemap-python.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sdiftypemap-python.i 3 Dec 2015 18:03:01 -0000 1.7 --- sdiftypemap-python.i 15 Mar 2017 10:54:34 -0000 1.8 *************** *** 6,9 **** --- 6,14 ---- // // $Log$ + // Revision 1.8 2017/03/15 10:54:34 roebel + // Summary: Version 1.4.25 - Python 3 fix + // + // Fixed typemap for converting strings into sdif signatures. + // // Revision 1.7 2015/12/03 18:03:01 roebel // Added support for python 3. *************** *** 39,52 **** %typemap(in) SdifSignature { if (PyString_Check($input) && (PyString_Size($input) == 4)) { $1 = SdifStringToSignature(PyString_AsString($input)); } ! %#if PY_MAJOR_VERSION < 3 ! else if (PyInt_Check($input)) { $1 = PyInt_AS_LONG($input); } %#else else if (PyInt_Check($input)) { --- 44,76 ---- %typemap(in) SdifSignature { + %#if PY_MAJOR_VERSION < 3 + fprintf(stderr,"StringCheck %d\n",PyString_Check($input)); + if(PyString_Check($input)) + fprintf(stderr,"StringSize %ld\n",PyString_Size($input)); if (PyString_Check($input) && (PyString_Size($input) == 4)) { $1 = SdifStringToSignature(PyString_AsString($input)); } ! else if (PyInt_Check($input)) { $1 = PyInt_AS_LONG($input); } %#else + if (PyUnicode_Check($input) ) + { + Py_ssize_t len = 0; + char *ascii_string = PyUnicode_AsUTF8AndSize($input, &len); + + if (ascii_string==0) { + /* exception is set in conversion function */ + return NULL; + } + if(len ==4) + $1 = SdifStringToSignature(ascii_string); + else{ + PyErr_SetString(PyExc_TypeError, "Signature argument has to be an integer or a 4 char ASCII string"); + return NULL; + } + } else if (PyInt_Check($input)) { *************** *** 57,61 **** else { ! PyErr_SetString(PyExc_TypeError, "Signature argument has to be an integer or a 4 char string"); return NULL; } --- 81,85 ---- else { ! PyErr_SetString(PyExc_TypeError, "Signature argument has to be an integer or a 4 char ASCII string"); return NULL; } |
From: Axel R. <ro...@us...> - 2017-03-11 09:15:09
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22025/swig/python Modified Files: CMakeLists.txt easdif-python.i Log Message: Summary: Version 1.4.29 - improved Python 3 support Correctly handle differences in iterator interfaces of python 2 and python 3 Index: easdif-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** easdif-python.i 26 Aug 2014 14:38:24 -0000 1.19 --- easdif-python.i 11 Mar 2017 09:15:07 -0000 1.20 *************** *** 6,9 **** --- 6,15 ---- // // $Log$ + // Revision 1.20 2017/03/11 09:15:07 roebel + // Summary: Version 1.4.29 - improved Python 3 support + // + // Correctly handle differences in iterator interfaces of python 2 and + // python 3 + // // Revision 1.19 2014/08/26 14:38:24 roebel // Added special exception specification for OpenRead to be able to catch the SDIFBadHeader exception. *************** *** 154,160 **** --- 160,170 ---- } + + + %define NEXT_INTERFACE_SUPPORT(NEXT_FUN_NAME) %{ #include "easdif/easdif.h" + // proxy class for frame that provides Frame iterator with storage location for iterator position struct *************** *** 164,169 **** FrameIt(const Easdif::SDIFFrame& in ) : mpOriFrame(&in), mIterPos(0) {} ~FrameIt() {} const Easdif::SDIFMatrix& ! next() { if(mIterPos < static_cast<int>(mpOriFrame->GetNbMatrix())) return mpOriFrame->GetMatrix(mIterPos++); --- 174,180 ---- FrameIt(const Easdif::SDIFFrame& in ) : mpOriFrame(&in), mIterPos(0) {} ~FrameIt() {} + const Easdif::SDIFMatrix& ! NEXT_FUN_NAME() { if(mIterPos < static_cast<int>(mpOriFrame->GetNbMatrix())) return mpOriFrame->GetMatrix(mIterPos++); *************** *** 172,176 **** }; - %} --- 183,186 ---- *************** *** 196,200 **** // but a pointer to a new Frame so we cannot modify the entity by means of the // frames in a loop ! %exception Easdif::SDIFEntity::next() { try { $action --- 206,211 ---- // but a pointer to a new Frame so we cannot modify the entity by means of the // frames in a loop ! ! %exception Easdif::SDIFEntity::NEXT_FUN_NAME() { try { $action *************** *** 206,210 **** } ! %newobject Easdif::SDIFEntity::next; %extend Easdif::SDIFEntity{ Easdif::SDIFEntity& --- 217,222 ---- } ! %newobject Easdif::SDIFEntity::NEXT_FUN_NAME; ! %extend Easdif::SDIFEntity{ Easdif::SDIFEntity& *************** *** 217,221 **** // prefer to work with pointers in python Easdif::SDIFFrame* ! next() { //allocate new frame Easdif::SDIFFrame *localFrame = new(Easdif::SDIFFrame); --- 229,233 ---- // prefer to work with pointers in python Easdif::SDIFFrame* ! NEXT_FUN_NAME() { //allocate new frame Easdif::SDIFFrame *localFrame = new(Easdif::SDIFFrame); *************** *** 235,239 **** // but a pointer to a new Matrix. This avoids problems with the missing reference counting // that would arise if teh original frame disappears before the matrix ! %exception Easdif::SDIFFrame::next() { try { $action --- 247,251 ---- // but a pointer to a new Matrix. This avoids problems with the missing reference counting // that would arise if teh original frame disappears before the matrix ! %exception Easdif::SDIFFrame::NEXT_FUN_NAME() { try { $action *************** *** 245,249 **** } ! %newobject Easdif::SDIFFrame::next; %newobject Easdif::SDIFFrame::copy; %extend Easdif::SDIFFrame { --- 257,261 ---- } ! %newobject Easdif::SDIFFrame::NEXT_FUN_NAME; %newobject Easdif::SDIFFrame::copy; %extend Easdif::SDIFFrame { *************** *** 254,262 **** // prefer to work with pointers in python Easdif::SDIFMatrix* ! next() { FrameIt * it = reinterpret_cast<FrameIt*>($self); Easdif::SDIFMatrix *pMat = new(Easdif::SDIFMatrix); try { ! *pMat = it->next(); } catch(...) { --- 266,274 ---- // prefer to work with pointers in python Easdif::SDIFMatrix* ! NEXT_FUN_NAME() { FrameIt * it = reinterpret_cast<FrameIt*>($self); Easdif::SDIFMatrix *pMat = new(Easdif::SDIFMatrix); try { ! *pMat = it->NEXT_FUN_NAME(); } catch(...) { *************** *** 271,277 **** return new Easdif::SDIFFrame(*$self); } - } %extend Easdif::FrameType{ PyObject* __str__() { --- 283,297 ---- return new Easdif::SDIFFrame(*$self); } } + %enddef + + #ifdef SWIG_PYTHON_3 + NEXT_INTERFACE_SUPPORT(__next__) + #else + NEXT_INTERFACE_SUPPORT(next) + #endif + + %extend Easdif::FrameType{ PyObject* __str__() { Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CMakeLists.txt 3 Dec 2015 18:03:01 -0000 1.23 --- CMakeLists.txt 11 Mar 2017 09:15:06 -0000 1.24 *************** *** 56,60 **** IF(PYTHON_VERSION_MAJOR EQUAL 3) MESSAGE("ENABLE SWIG Python 3 flag") ! SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-py3" ) ENDIF(PYTHON_VERSION_MAJOR EQUAL 3) --- 56,60 ---- IF(PYTHON_VERSION_MAJOR EQUAL 3) MESSAGE("ENABLE SWIG Python 3 flag") ! SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-py3" "-DSWIG_PYTHON_3=1") ENDIF(PYTHON_VERSION_MAJOR EQUAL 3) |
From: Axel R. <ro...@us...> - 2017-03-11 09:15:08
|
Update of /cvsroot/sdif/Easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22025 Modified Files: CMakeLists.txt ChangeLog Log Message: Summary: Version 1.4.29 - improved Python 3 support Correctly handle differences in iterator interfaces of python 2 and python 3 Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** CMakeLists.txt 2 Aug 2016 11:16:07 -0000 1.84 --- CMakeLists.txt 11 Mar 2017 09:15:06 -0000 1.85 *************** *** 45,49 **** SET(EASDIF_VERSION_MAJ 1) SET(EASDIF_VERSION_MIN 4) ! SET(EASDIF_VERSION_RELEASE 23) SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}") --- 45,49 ---- SET(EASDIF_VERSION_MAJ 1) SET(EASDIF_VERSION_MIN 4) ! SET(EASDIF_VERSION_RELEASE 24) SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}") Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/Easdif/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** ChangeLog 18 Nov 2014 13:56:12 -0000 1.95 --- ChangeLog 11 Mar 2017 09:15:06 -0000 1.96 *************** *** 1,2 **** --- 1,9 ---- + 2017-03-11 Axel Roebel <roebel@m2336.local> + Version 1.4.24 + + * swig/python/CMakeLists.txt, swig/python/easdif-python.i : + Correctly handle differences in iterator interfaces of python 2 and + python 3 + 2014-11-18 Frederic Cornu <co...@ir...> Version 1.4.23 |
From: Axel R. <ro...@us...> - 2016-08-27 07:43:53
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19698/easdif Modified Files: CMakeLists.txt Log Message: Small Fix in cmake configuration After the last fix the file SET_INSTALL_NAME.cmake.in could no longer be found in cases where EASDIF is a subproject in a larger project. This is working again now. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/CMakeLists.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CMakeLists.txt 2 Aug 2016 11:18:01 -0000 1.24 --- CMakeLists.txt 27 Aug 2016 07:43:50 -0000 1.25 *************** *** 67,71 **** ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/SDIF/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) --- 67,71 ---- ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../SDIF/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) |
From: Axel R. <ro...@us...> - 2016-08-02 11:18:03
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25845/EASDIF_SDIF/easdif Modified Files: CMakeLists.txt Log Message: fixed path to cmake file Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/CMakeLists.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CMakeLists.txt 29 Oct 2009 14:01:06 -0000 1.23 --- CMakeLists.txt 2 Aug 2016 11:18:01 -0000 1.24 *************** *** 67,71 **** ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) --- 67,71 ---- ELSE(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) SET(INSTALLED_TARGET_NAME ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Easdif${DEBUGEXT}${CMAKE_SHARED_LIBRARY_SUFFIX}.${EASDIF_VERSION}) ! CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/SDIF/cmModules/SET_INSTALL_NAME.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake) SET_TARGET_PROPERTIES(Easdif${DEBUGEXT} PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/SET_INSTALL_NAME.cmake ) ENDIF(CMAKE_MINOR_VERSION GREATER 3 AND CMAKE_MAJOR_VERSION EQUAL 2) |
From: Axel R. <ro...@us...> - 2016-08-02 11:16:09
|
Update of /cvsroot/sdif/Easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25777 Modified Files: CMakeLists.txt Log Message: Added cmake policies to avoid warnings. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** CMakeLists.txt 6 Jun 2014 15:30:54 -0000 1.83 --- CMakeLists.txt 2 Aug 2016 11:16:07 -0000 1.84 *************** *** 36,40 **** CMAKE_POLICY(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) ! SET(EASDIF_VERSION_MAJ 1) --- 36,45 ---- CMAKE_POLICY(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) ! IF(POLICY CMP0042) ! CMAKE_POLICY(SET CMP0042 OLD) ! ENDIF(POLICY CMP0042) ! IF(POLICY CMP0054) ! CMAKE_POLICY(SET CMP0054 OLD) ! ENDIF(POLICY CMP0054) SET(EASDIF_VERSION_MAJ 1) |
From: Axel R. <ro...@us...> - 2016-08-02 11:15:39
|
Update of /cvsroot/sdif/SDIF In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25745 Modified Files: CMakeLists.txt Log Message: Added cmake policies to avoid warnings. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** CMakeLists.txt 12 Jul 2011 10:47:17 -0000 1.26 --- CMakeLists.txt 2 Aug 2016 11:15:37 -0000 1.27 *************** *** 38,41 **** --- 38,47 ---- CMAKE_POLICY(SET CMP0003 NEW) ENDIF(COMMAND cmake_policy) + IF(POLICY CMP0042) + CMAKE_POLICY(SET CMP0042 OLD) + ENDIF(POLICY CMP0042) + IF(POLICY CMP0054) + CMAKE_POLICY(SET CMP0054 OLD) + ENDIF(POLICY CMP0054) |
From: Axel R. <ro...@us...> - 2016-08-02 10:44:34
|
Update of /cvsroot/sdif/Easdif/swig In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24499/swig Modified Files: easdif-common-init.i Log Message: add std_map.i to includes Index: easdif-common-init.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/easdif-common-init.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** easdif-common-init.i 2 Sep 2012 01:19:03 -0000 1.6 --- easdif-common-init.i 2 Aug 2016 10:44:32 -0000 1.7 *************** *** 28,31 **** --- 28,34 ---- %include std_vector.i + // include typemap for std::map from SWIG library + %include std_map.i + // include typemap for std::list from SWIG library %include std_list.i |
From: Axel R. <ro...@us...> - 2015-12-03 18:03:04
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10735/swig/python Modified Files: CMakeLists.txt sdiftypemap-python.i Log Message: Added support for python 3. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** CMakeLists.txt 23 May 2014 10:56:14 -0000 1.22 --- CMakeLists.txt 3 Dec 2015 18:03:01 -0000 1.23 *************** *** 20,24 **** ENDFOREACH(PP ${PYTHON_INCLUDE_PATH}) ! EXECUTE_PROCESS(COMMAND ${PYTHON} -c "import numpy\nif hasattr(numpy,'get_include'):\n ss=numpy.get_include()\nelse: ss=numpy.get_numpy_include()\nprint ss" OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE) STRING(REGEX REPLACE "[ \t]+" ";" NUMPY_INC_HINT ${out}) MESSAGE("NUMPY_INC_HINT ${NUMPY_INC_HINT}") --- 20,24 ---- ENDFOREACH(PP ${PYTHON_INCLUDE_PATH}) ! EXECUTE_PROCESS(COMMAND ${PYTHON} -c "from __future__ import print_function\nimport numpy\nif hasattr(numpy,'get_include'):\n ss=numpy.get_include()\nelse: ss=numpy.get_numpy_include()\nprint(ss)" OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE) STRING(REGEX REPLACE "[ \t]+" ";" NUMPY_INC_HINT ${out}) MESSAGE("NUMPY_INC_HINT ${NUMPY_INC_HINT}") *************** *** 37,41 **** EXECUTE_PROCESS(COMMAND ${PYTHON} --version OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE) ! STRING(REGEX REPLACE "[a-zA-Z0-9 \t]* \([0-9]+[.][0-9]+\).*" "\\1" PYTHON_VERSION ${err}) MESSAGE(STATUS "PYTHON_VERSION ${PYTHON_VERSION}") SET(BUILD_WITH_INSTALL_RPATH ON) --- 37,42 ---- EXECUTE_PROCESS(COMMAND ${PYTHON} --version OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE) ! STRING(REGEX REPLACE "[a-zA-Z0-9 \t]* \([0-9]+[.][0-9]+\).*" "\\1" PYTHON_VERSION ${err}${out}) ! STRING(REGEX REPLACE "\([0-9]+\)[.][0-9]+.*" "\\1" PYTHON_VERSION_MAJOR ${PYTHON_VERSION}) MESSAGE(STATUS "PYTHON_VERSION ${PYTHON_VERSION}") SET(BUILD_WITH_INSTALL_RPATH ON) *************** *** 49,54 **** ELSE(NUMPY_INCLUDE) SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}") ! ENDIF(NUMPY_INCLUDE) SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} ) # libraries will should be found on runtime for this to work on mac oswe need to add linker options --- 50,62 ---- ELSE(NUMPY_INCLUDE) SET(CMAKE_SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}" "-I${CMAKE_CURRENT_SOURCE_DIR}") ! ENDIF(NUMPY_INCLUDE) + MESSAGE("PYTHON Major VERSION ${PYTHON_VERSION_MAJOR}") + + IF(PYTHON_VERSION_MAJOR EQUAL 3) + MESSAGE("ENABLE SWIG Python 3 flag") + SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-py3" ) + ENDIF(PYTHON_VERSION_MAJOR EQUAL 3) + SWIG_ADD_MODULE(eaSDIF python ${INTERFACE_SRC} ) # libraries will should be found on runtime for this to work on mac oswe need to add linker options Index: sdiftypemap-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/sdiftypemap-python.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sdiftypemap-python.i 21 May 2014 23:55:21 -0000 1.6 --- sdiftypemap-python.i 3 Dec 2015 18:03:01 -0000 1.7 *************** *** 6,9 **** --- 6,12 ---- // // $Log$ + // Revision 1.7 2015/12/03 18:03:01 roebel + // Added support for python 3. + // // Revision 1.6 2014/05/21 23:55:21 roebel // Fixed FrameType constructor to accept python strings with exactly 4 chars. *************** *** 40,47 **** --- 43,58 ---- $1 = SdifStringToSignature(PyString_AsString($input)); } + %#if PY_MAJOR_VERSION < 3 else if (PyInt_Check($input)) { $1 = PyInt_AS_LONG($input); } + %#else + else if (PyInt_Check($input)) + { + $1 = PyLong_AS_LONG($input); + } + %#endif + else { |
From: Axel R. <ro...@us...> - 2015-12-03 18:03:03
|
Update of /cvsroot/sdif/Easdif/swig In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10735/swig Modified Files: numpy.i Log Message: Added support for python 3. Index: numpy.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/numpy.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** numpy.i 2 Sep 2012 01:19:03 -0000 1.1 --- numpy.i 3 Dec 2015 18:03:01 -0000 1.2 *************** *** 12,72 **** /**********************************************************************/ - %fragment("NumPy_Backward_Compatibility", "header") - { - /* Support older NumPy data type names - */ - %#if NDARRAY_VERSION < 0x01000000 - %#define NPY_BOOL PyArray_BOOL - %#define NPY_BYTE PyArray_BYTE - %#define NPY_UBYTE PyArray_UBYTE - %#define NPY_SHORT PyArray_SHORT - %#define NPY_USHORT PyArray_USHORT - %#define NPY_INT PyArray_INT - %#define NPY_UINT PyArray_UINT - %#define NPY_LONG PyArray_LONG - %#define NPY_ULONG PyArray_ULONG - %#define NPY_LONGLONG PyArray_LONGLONG - %#define NPY_ULONGLONG PyArray_ULONGLONG - %#define NPY_FLOAT PyArray_FLOAT - %#define NPY_DOUBLE PyArray_DOUBLE - %#define NPY_LONGDOUBLE PyArray_LONGDOUBLE - %#define NPY_CFLOAT PyArray_CFLOAT - %#define NPY_CDOUBLE PyArray_CDOUBLE - %#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE - %#define NPY_OBJECT PyArray_OBJECT - %#define NPY_STRING PyArray_STRING - %#define NPY_UNICODE PyArray_UNICODE - %#define NPY_VOID PyArray_VOID - %#define NPY_NTYPES PyArray_NTYPES - %#define NPY_NOTYPE PyArray_NOTYPE - %#define NPY_CHAR PyArray_CHAR - %#define NPY_USERDEF PyArray_USERDEF - %#define npy_intp intp - - %#define NPY_MAX_BYTE MAX_BYTE - %#define NPY_MIN_BYTE MIN_BYTE - %#define NPY_MAX_UBYTE MAX_UBYTE - %#define NPY_MAX_SHORT MAX_SHORT - %#define NPY_MIN_SHORT MIN_SHORT - %#define NPY_MAX_USHORT MAX_USHORT - %#define NPY_MAX_INT MAX_INT - %#define NPY_MIN_INT MIN_INT - %#define NPY_MAX_UINT MAX_UINT - %#define NPY_MAX_LONG MAX_LONG - %#define NPY_MIN_LONG MIN_LONG - %#define NPY_MAX_ULONG MAX_ULONG - %#define NPY_MAX_LONGLONG MAX_LONGLONG - %#define NPY_MIN_LONGLONG MIN_LONGLONG - %#define NPY_MAX_ULONGLONG MAX_ULONGLONG - %#define NPY_MAX_INTP MAX_INTP - %#define NPY_MIN_INTP MIN_INTP - - %#define NPY_FARRAY FARRAY - %#define NPY_F_CONTIGUOUS F_CONTIGUOUS - %#endif - } - - /**********************************************************************/ - /* The following code originally appeared in * enthought/kiva/agg/src/numeric.i written by Eric Jones. It was --- 12,15 ---- *************** *** 108,114 **** if (PyList_Check( py_obj)) return "list" ; if (PyTuple_Check( py_obj)) return "tuple" ; - if (PyFile_Check( py_obj)) return "file" ; if (PyModule_Check( py_obj)) return "module" ; if (PyInstance_Check(py_obj)) return "instance" ; return "unkown type"; --- 51,59 ---- if (PyList_Check( py_obj)) return "list" ; if (PyTuple_Check( py_obj)) return "tuple" ; if (PyModule_Check( py_obj)) return "module" ; + %#if PY_MAJOR_VERSION < 3 + if (PyFile_Check( py_obj)) return "file" ; if (PyInstance_Check(py_obj)) return "instance" ; + %#endif return "unkown type"; |
From: Diemo S. <di...@us...> - 2015-10-14 16:15:17
|
Update of /cvsroot/sdif/SDIF/macosxbuild/SDIF.xcodeproj In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11839/SDIF.xcodeproj Modified Files: project.pbxproj Log Message: build universal binary framework Index: project.pbxproj =================================================================== RCS file: /cvsroot/sdif/SDIF/macosxbuild/SDIF.xcodeproj/project.pbxproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.pbxproj 5 Mar 2013 14:23:11 -0000 1.7 --- project.pbxproj 14 Oct 2015 16:15:15 -0000 1.8 *************** *** 460,463 **** --- 460,465 ---- 0F5C28A9047E732E006640BC /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = 21AFA3B60907D5740018539F /* Build configuration list for PBXProject "SDIF" */; compatibilityVersion = "Xcode 2.4"; *************** *** 910,915 **** --- 912,919 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CURRENT_PROJECT_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)"; FRAMEWORK_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR)"; + SDKROOT = macosx10.6; VERSION_MAJOR = 3; VERSION_MINOR = 11; *************** *** 921,932 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); CURRENT_PROJECT_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)"; FRAMEWORK_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR)"; ! GCC_VERSION = 4.0; ! SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; VERSION_MAJOR = 3; VERSION_MINOR = 11; --- 925,933 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CURRENT_PROJECT_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)"; FRAMEWORK_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR)"; ! GCC_OPTIMIZATION_LEVEL = 3; ! SDKROOT = macosx10.6; VERSION_MAJOR = 3; VERSION_MINOR = 11; *************** *** 938,943 **** --- 939,946 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CURRENT_PROJECT_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)"; FRAMEWORK_VERSION = "$(VERSION_MAJOR).$(VERSION_MINOR)"; + SDKROOT = macosx10.6; VERSION_MAJOR = 3; VERSION_MINOR = 11; |
From: Diemo S. <di...@us...> - 2015-10-14 16:00:41
|
Update of /cvsroot/sdif/SDIF/sdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11166/sdif Modified Files: host_architecture.h Log Message: add x86_64 (according to llvm defines in http://webcache.googleusercontent.com/search?q=cache:Vmd8fepVsyAJ:https://llvm.org/svn/llvm-project/cfe/trunk/test/Preprocessor/predefined-arch-macros.c+&cd=4&hl=en&ct=clnk&gl=fr) Index: host_architecture.h =================================================================== RCS file: /cvsroot/sdif/SDIF/sdif/host_architecture.h,v retrieving revision 3.4 retrieving revision 3.5 diff -C2 -d -r3.4 -r3.5 *** host_architecture.h 16 Jul 2013 11:13:10 -0000 3.4 --- host_architecture.h 14 Oct 2015 16:00:38 -0000 3.5 *************** *** 12,15 **** --- 12,16 ---- HOST_ARCH_68K - Current architecture is 680x0 HOST_ARCH_X86 - Current architecture is Intel PC (386..Pentium) + HOST_ARCH_X86_64 - Current architecture is Intel 64bit HOST_ARCH_n86 - Current architecture is Intel (3|4)86, Pentium/K5 (586), or Pentium II (686) *************** *** 46,49 **** --- 47,53 ---- $Log$ + Revision 3.5 2015/10/14 16:00:38 diemo + add x86_64 (according to llvm defines in http://webcache.googleusercontent.com/search?q=cache:Vmd8fepVsyAJ:https://llvm.org/svn/llvm-project/cfe/trunk/test/Preprocessor/predefined-arch-macros.c+&cd=4&hl=en&ct=clnk&gl=fr) + Revision 3.4 2013/07/16 11:13:10 diemo add detection of iOS and android (untested) *************** *** 156,159 **** --- 160,168 ---- # define HOST_ARCH_X86 1 + #elif defined(x86_64) || defined(__x86_64) + + # define HOST_ARCH_X86 1 + # define HOST_ARCH_X86_64 1 + #elif defined(__arm__) |
From: Axel R. <ro...@us...> - 2014-09-26 17:46:19
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22358/easdif Modified Files: sdif_frame.cpp Log Message: fixed reading empty frames if FrameDireectory is active Index: sdif_frame.cpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/sdif_frame.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sdif_frame.cpp 6 Jun 2014 15:30:54 -0000 1.5 --- sdif_frame.cpp 26 Sep 2014 17:46:16 -0000 1.6 *************** *** 36,39 **** --- 36,42 ---- * * $Log$ + * Revision 1.6 2014/09/26 17:46:16 roebel + * fixed reading empty frames if FrameDireectory is active + * * Revision 1.5 2014/06/06 15:30:54 roebel * Clarified documentation or Entity::ReadNextFrame, Entity::ReadNextSelectedFrame and fixed implementation such that it works for frames not containing any matrices being located at the end of the SDIF file. *************** *** 239,243 **** SdifFCurrTime(file),SdifFCurrNbMatrix(file), file->StartChunkPos,it); ! Resize(mNbMatrix); if(!isnew) { --- 242,246 ---- SdifFCurrTime(file),SdifFCurrNbMatrix(file), file->StartChunkPos,it); ! Resize(mNbMatrix); if(!isnew) { *************** *** 265,270 **** } ! if(ir && entity.isFrameHLSelected(SdifFCurrID(file), ! SdifFCurrFrameSignature(file))){ Resize(ir); entity.mLastReadPos = it; --- 268,273 ---- } ! if(entity.isFrameHLSelected(SdifFCurrID(file), ! SdifFCurrFrameSignature(file))){ Resize(ir); entity.mLastReadPos = it; *************** *** 324,328 **** return 0; } - mTime = SdifFCurrTime(file); mSig = SdifFCurrFrameSignature(file); --- 327,330 ---- |
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))); } |
From: Axel R. <ro...@us...> - 2014-09-24 15:25:03
|
Update of /cvsroot/sdif/Easdif/matlab In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15633 Modified Files: CMakeLists.txt Log Message: Support setting MEXOPTS file. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/CMakeLists.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CMakeLists.txt 3 Jan 2012 23:38:25 -0000 1.13 --- CMakeLists.txt 24 Sep 2014 15:25:01 -0000 1.14 *************** *** 1,4 **** SET(EASDIF_MATLAB_VERSION_MAJ 1) ! SET(EASDIF_MATLAB_VERSION_MIN 1) SET(EASDIF_MATLAB_VERSION_REL 1) --- 1,4 ---- SET(EASDIF_MATLAB_VERSION_MAJ 1) ! SET(EASDIF_MATLAB_VERSION_MIN 2) SET(EASDIF_MATLAB_VERSION_REL 1) *************** *** 94,97 **** --- 94,101 ---- ENDIF(${CMAKE_BUILD_TYPE} MATCHES "debug") + IF(CMAKE_MEXOPTS_FILE) + SET(MEXFLAGS ${MEXFLAGS} -f ${CMAKE_MEXOPTS_FILE}) + ENDIF(CMAKE_MEXOPTS_FILE) + MESSAGE("MEXFLAGS ${MEXFLAGS}") IF(WIN32) SET(COMPILER_SELECTOR_VAR "COMPILER") |
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))); } |
From: Axel R. <ro...@us...> - 2014-09-24 14:09:21
|
Update of /cvsroot/sdif/Easdif/easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11792 Modified Files: sdif_matrix.hpp Log Message: Fixed reading text stored i a column for text matrices. Index: sdif_matrix.hpp =================================================================== RCS file: /cvsroot/sdif/Easdif/easdif/sdif_matrix.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** sdif_matrix.hpp 23 May 2014 10:23:46 -0000 1.11 --- sdif_matrix.hpp 24 Sep 2014 14:09:19 -0000 1.12 *************** *** 37,40 **** --- 37,43 ---- * * $Log$ + * Revision 1.12 2014/09/24 14:09:19 roebel + * Fixed reading text stored i a column for text matrices. + * * Revision 1.11 2014/05/23 10:23:46 roebel * Added throw specifications. *************** *** 615,619 **** 0,eUnknown,0,0); ! for(int ii=0;ii<GetNbRows();++ii) value.append(1,static_cast<char>(GetInt(ii,0))); --- 618,623 ---- 0,eUnknown,0,0); ! // 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))); |
From: Axel R. <ro...@us...> - 2014-08-26 14:38:27
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15384/swig/python Modified Files: easdif-python.i Log Message: Added special exception specification for OpenRead to be able to catch the SDIFBadHeader exception. Index: easdif-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** easdif-python.i 19 Jun 2014 20:48:52 -0000 1.18 --- easdif-python.i 26 Aug 2014 14:38:24 -0000 1.19 *************** *** 6,9 **** --- 6,12 ---- // // $Log$ + // Revision 1.19 2014/08/26 14:38:24 roebel + // Added special exception specification for OpenRead to be able to catch the SDIFBadHeader exception. + // // Revision 1.18 2014/06/19 20:48:52 roebel // Properly handle exception in OpenRead. *************** *** 82,85 **** --- 85,108 ---- %include ../easdif-defines.i + %exception OpenRead { + try { + $action + } catch(const SDIFBadHeader& e) { + PyErr_SetString(PyExc_EOFError,e.getmessage().c_str()); + return 0; + } 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 ReadNextFrame { try { |
From: Diemo S. <di...@us...> - 2014-08-10 23:33:49
|
Update of /cvsroot/sdif/sdif-website In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1329 Modified Files: index.html Log Message: point to new sdif wiki: old hosted app mediawiki has been migrated to fresh media wiki install in project web space. (built-in Allura wiki has been deleted to avoid confusion) Index: index.html =================================================================== RCS file: /cvsroot/sdif/sdif-website/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.html 18 Sep 2008 17:29:16 -0000 1.10 --- index.html 10 Aug 2014 23:33:47 -0000 1.11 *************** *** 25,31 **** <h2 id="tocSDIF1"><a href="sdif-documentation.html">Documentation</a></h2> <a class="sdif_link" href="sdif-documentation.html#Introduction">Introduction</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net/SDIF+FAQ">FAQ</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net/SDIF+Examples">Examples</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net/SDIF+Articles">Articles</a><br /> --- 25,31 ---- <h2 id="tocSDIF1"><a href="sdif-documentation.html">Documentation</a></h2> <a class="sdif_link" href="sdif-documentation.html#Introduction">Introduction</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/SDIF FAQ">FAQ</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/SDIF Examples">Examples</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/SDIF Articles">Articles</a><br /> *************** *** 40,50 **** <a class="sdif_link" href="sdif-documentation.html#Libraries">Libraries</a>, <a class="sdif_link" href="sdif-documentation.html#Tools">Tools</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net/SDIF+Matlab">Matlab-extensions</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net/Applications">Applications</a><br /> <h2 id="tocSDIF4"><a href="sdif-documentation.html#Community">Community</a></h2> <a class="sdif_link" href="sdif-documentation.html#Mailinglist">Mailing List</a>, ! <a class="sdif_link" href="http://sdif.wiki.sourceforge.net">Wiki</a><br /> <p><br><br> --- 40,50 ---- <a class="sdif_link" href="sdif-documentation.html#Libraries">Libraries</a>, <a class="sdif_link" href="sdif-documentation.html#Tools">Tools</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/SDIF Matlab">Matlab-extensions</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/Applications">Applications</a><br /> <h2 id="tocSDIF4"><a href="sdif-documentation.html#Community">Community</a></h2> <a class="sdif_link" href="sdif-documentation.html#Mailinglist">Mailing List</a>, ! <a class="sdif_link" href="http://sdif.sourceforge.net/wiki/index.php/">Wiki</a><br /> <p><br><br> |
From: Axel R. <ro...@us...> - 2014-06-19 20:48:54
|
Update of /cvsroot/sdif/Easdif/swig/python In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24433/swig/python Modified Files: easdif-python.i Log Message: Properly handle exception in OpenRead. Index: easdif-python.i =================================================================== RCS file: /cvsroot/sdif/Easdif/swig/python/easdif-python.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** easdif-python.i 23 May 2014 10:33:15 -0000 1.17 --- easdif-python.i 19 Jun 2014 20:48:52 -0000 1.18 *************** *** 6,9 **** --- 6,12 ---- // // $Log$ + // Revision 1.18 2014/06/19 20:48:52 roebel + // Properly handle exception in OpenRead. + // // Revision 1.17 2014/05/23 10:33:15 roebel // Changed so that ReadNext..Frame methods properly throw EOF exception. *************** *** 113,116 **** --- 116,134 ---- } + + %exception OpenRead { + try { + $action + } 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" |
From: Axel R. <ro...@us...> - 2014-06-06 15:30:56
|
Update of /cvsroot/sdif/Easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18964 Modified Files: CMakeLists.txt Log Message: Clarified documentation or Entity::ReadNextFrame, Entity::ReadNextSelectedFrame and fixed implementation such that it works for frames not containing any matrices being located at the end of the SDIF file. This fixes a bug notably in the python Entity iterator that would not retriev empty frames located at the end of an SDIF file. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** CMakeLists.txt 23 May 2014 10:43:05 -0000 1.82 --- CMakeLists.txt 6 Jun 2014 15:30:54 -0000 1.83 *************** *** 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}") --- 40,44 ---- SET(EASDIF_VERSION_MAJ 1) SET(EASDIF_VERSION_MIN 4) ! SET(EASDIF_VERSION_RELEASE 23) SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}") |
From: Axel R. <ro...@us...> - 2014-05-23 11:01:54
|
Update of /cvsroot/sdif/Easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20560 Modified Files: ChangeLog Log Message: Updated for 1.4.22 Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/Easdif/ChangeLog,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** ChangeLog 23 May 2014 11:01:24 -0000 1.92 --- ChangeLog 23 May 2014 11:01:52 -0000 1.93 *************** *** 1,4 **** 2014-05-23 Axel Roebel <roebel@m2336.local> ! Version 1.4.22 (mostly * swig/python/CMakeLists.txt: --- 1,4 ---- 2014-05-23 Axel Roebel <roebel@m2336.local> ! Version 1.4.22 * swig/python/CMakeLists.txt: |
From: Axel R. <ro...@us...> - 2014-05-23 11:01:26
|
Update of /cvsroot/sdif/Easdif In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20534 Modified Files: ChangeLog Log Message: Updated for 1.4.22 Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/Easdif/ChangeLog,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** ChangeLog 19 Nov 2013 15:24:30 -0000 1.91 --- ChangeLog 23 May 2014 11:01:24 -0000 1.92 *************** *** 1,2 **** --- 1,60 ---- + 2014-05-23 Axel Roebel <roebel@m2336.local> + Version 1.4.22 (mostly + + * swig/python/CMakeLists.txt: + changed install swig python target name to avoid conflicts + + * swig/easdif-common.i.in: + added exception typemap for Accessing matrices in frames + + * CMakeLists.txt: Fixed verbose output. + + * swig/python/easdif-python.i: + Changed so that ReadNext..Frame methods properly throw EOF exception. + + * swig/easdif-common.i.in: + Use exception typemap to improve exception handling for + Matrix.Get/Set methods. + + * easdif/sdifmatrixdatainterface.hpp, easdif/sdifmatrixdata.hpp: + Added interface for retrieving raw pointer and elementsize. + + * easdif/sdif_matrix.hpp: + Added throw specifications. + + 2014-05-21 Axel Roebel <roebel@m2336.local> + + * swig/python/easdif-python.i, swig/python/sdiftypemap-python.i: + 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. + + * swig/easdif-common.i.in: + Added vector template for std::vector<MatrixType> and std::vector<FrameType> that are used by Entity::GetTypes functions. + + 2014-04-11 Axel Roebel <roebel@m2336.local> + + * swig/python/easdif-python.i: Support reading with int8 numpy type. + + * swig/CMakeLists.txt, swig/python/CMakeLists.txt, CMakeLists.txt: + Fixed remaining conditions that use old swig option variables. + + * swig/CMakeLists.txt, swig/README, CMakeLists.txt: + Changed control variables for swig interfaces from DO_XYZ to EASDIF_DO_XYZ to improve readability when run within another module + + 2014-04-10 Axel Roebel <roebel@m2336.local> + + * swig/easdif-common.i.in, swig/easdif-defines.i, + * swig/python/CMakeLists.txt, swig/python/easdif-python.i, swig/sdif-common.i.in, swig/CMakeLists.txt: + More robust include file organisation. + Extended types of vector that are supported to read from matrices and vectors. + + 2014-03-21 Axel Roebel <roebel@m2336.local> + + * CMakeLists.txt, swig/CMakeLists.txt, swig/README: + Support individal selection of swig interfaces + + * SDIF/cmModules/SET_COMPILER_FLAGS.cmake: + Support clang compiler on Darwin. + 2013-11-19 Frederic Cornu <co...@ir...> |