Menu
▾
▴
sdif-cvs — This list receives the CVS logs
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...> - 2011-12-19 17:48:13
|
Update of /cvsroot/sdif/SDIF In directory vz-cvs-3.sog:/tmp/cvs-serv21627 Modified Files: ChangeLog configure.in Log Message: Version 3.11.4 Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/SDIF/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** ChangeLog 19 Dec 2011 17:45:55 -0000 1.64 --- ChangeLog 19 Dec 2011 17:48:10 -0000 1.65 *************** *** 1,3 **** --- 1,4 ---- 2011-12-19 Axel Roebel <ro...@m1...> + Version 3.11.4 * sdif/SdifFGet.c: Index: configure.in =================================================================== RCS file: /cvsroot/sdif/SDIF/configure.in,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** configure.in 11 Jun 2011 23:23:10 -0000 1.81 --- configure.in 19 Dec 2011 17:48:10 -0000 1.82 *************** *** 32,35 **** --- 32,38 ---- dnl $Log$ + dnl Revision 1.82 2011/12/19 17:48:10 roebel + dnl Version 3.11.4 + dnl dnl Revision 1.81 2011/06/11 23:23:10 roebel dnl Fixed a number of issues with the conditional include of stdint.h and sys/types.h in instaled include file *************** *** 345,349 **** SDIF_VERSION_MAJOR=3 SDIF_VERSION_MINOR=11 ! SDIF_VERSION_RELEASE=3 VERSION=$SDIF_VERSION_MAJOR.$SDIF_VERSION_MINOR.$SDIF_VERSION_RELEASE --- 348,352 ---- SDIF_VERSION_MAJOR=3 SDIF_VERSION_MINOR=11 ! SDIF_VERSION_RELEASE=4 VERSION=$SDIF_VERSION_MAJOR.$SDIF_VERSION_MINOR.$SDIF_VERSION_RELEASE |
|
From: Axel R. <ro...@us...> - 2011-12-19 17:45:58
|
Update of /cvsroot/sdif/SDIF In directory vz-cvs-3.sog:/tmp/cvs-serv20426 Modified Files: ChangeLog Log Message: document change Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/SDIF/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** ChangeLog 11 Jun 2011 23:24:51 -0000 1.63 --- ChangeLog 19 Dec 2011 17:45:55 -0000 1.64 *************** *** 1,2 **** --- 1,11 ---- + 2011-12-19 Axel Roebel <ro...@m1...> + + * sdif/SdifFGet.c: + Gracefully handle NVT tables that do not include a trailing \000 + as for examples the once written with the writesdif function in the old + matlab sdif toolbox. Obligation to have a trailing 0 in the 1NVT + matrix is not required in the SDIF specs and therefore the + present change seems appropriate. + 2011-06-11 Axel Roebel <roebel@m1873.local> |
|
From: Axel R. <ro...@us...> - 2011-12-19 17:36:10
|
Update of /cvsroot/sdif/SDIF/sdif
In directory vz-cvs-3.sog:/tmp/cvs-serv18239
Modified Files:
SdifFGet.c
Log Message:
Graefully handle NVT tables that do not include a trailing 0. This problem is related to the use of the writesdif function to create NVT tables
Index: SdifFGet.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/SdifFGet.c,v
retrieving revision 3.23
retrieving revision 3.24
diff -C2 -d -r3.23 -r3.24
*** SdifFGet.c 26 Nov 2007 18:51:53 -0000 3.23
--- SdifFGet.c 19 Dec 2011 17:36:08 -0000 3.24
***************
*** 33,36 ****
--- 33,39 ----
*
* $Log$
+ * Revision 3.24 2011/12/19 17:36:08 roebel
+ * Graefully handle NVT tables that do not include a trailing 0. This problem is related to the use of the writesdif function to create NVT tables
+ *
* Revision 3.23 2007/11/26 18:51:53 roebel
* Changed data types to have less casts and
***************
*** 323,327 ****
_SdifFError (SdifF, eSyntax, "Name-Value Table text matrix must "
"have exactly one column!");
! str = SdifCalloc (char, nrow * SdifFCurrNbCol (SdifF));
SizeR += SdiffReadChar (str, nrow, SdifF);
SizeR += SdifFReadPadding(SdifF, SdifFPaddingCalculate (SdifF->Stream, SizeR));
--- 326,334 ----
_SdifFError (SdifF, eSyntax, "Name-Value Table text matrix must "
"have exactly one column!");
! /* force a zero at the end of the string
! * hacky use of the old writesdif function has created NVTs for that the
! * NVT matrices do not inlcude a trailing \000.
! */
! str = SdifCalloc (char, nrow * SdifFCurrNbCol (SdifF) + 1);
SizeR += SdiffReadChar (str, nrow, SdifF);
SizeR += SdifFReadPadding(SdifF, SdifFPaddingCalculate (SdifF->Stream, SizeR));
***************
*** 334,338 ****
int CharEnd;
char sdifString[_SdifStringLen];
!
_SdifRemark ("Warning, this file uses an intermediate format for "
"the Name-Value Table. Portablity with programs not "
--- 341,345 ----
int CharEnd;
char sdifString[_SdifStringLen];
!
_SdifRemark ("Warning, this file uses an intermediate format for "
"the Name-Value Table. Portablity with programs not "
|
|
From: Axel R. <ro...@us...> - 2011-09-27 11:59:36
|
Update of /cvsroot/sdif/Easdif/matlab In directory vz-cvs-3.sog:/tmp/cvs-serv7303 Modified Files: Fsdifread.m Log Message: Fixed documentation. Index: Fsdifread.m =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/Fsdifread.m,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Fsdifread.m 31 Oct 2009 17:25:09 -0000 1.5 --- Fsdifread.m 27 Sep 2011 11:59:34 -0000 1.6 *************** *** 47,51 **** % % As an alternative to the time and stream fields the selection ! % can use timerange and streamRange fields with exactly 2 values. These % will select the range of values between the two boundaries. % If range fields are present only a scalar selection struct can be used. --- 47,51 ---- % % As an alternative to the time and stream fields the selection ! % can use timeRange and streamRange fields with exactly 2 values. These % will select the range of values between the two boundaries. % If range fields are present only a scalar selection struct can be used. |
|
From: Axel R. <ro...@us...> - 2011-09-27 11:27:38
|
Update of /cvsroot/sdif/Easdif/matlab
In directory vz-cvs-3.sog:/tmp/cvs-serv4003/matlab
Modified Files:
Fsdif_read_handler.cpp
Log Message:
Properly handle matrices with 0 rows.
Index: Fsdif_read_handler.cpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/matlab/Fsdif_read_handler.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Fsdif_read_handler.cpp 12 Jul 2011 10:46:03 -0000 1.16
--- Fsdif_read_handler.cpp 27 Sep 2011 11:27:35 -0000 1.17
***************
*** 211,313 ****
++pd;
mxArray *data = 0;
! if(classid == mxUNKNOWN_CLASS) {
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
}
- default:
- char tmperr[256];
- sprintf(tmperr,"Unsupported data type %x",mat.GetType());
- mexErrMsgTxt(tmperr);
- }
- }
- else {
- data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(), classid, mxREAL);
- switch(classid) {
- case mxDOUBLE_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxSINGLE_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT8_CLASS :
- data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt1 *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT16_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT32_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT8_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT16_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT32_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- default:
- char tmperr[256];
- sprintf(tmperr,"Unsupported data type %x",mat.GetType());
- mexErrMsgTxt(tmperr);
- }
}
if(data)
--- 211,316 ----
++pd;
mxArray *data = 0;
!
! if(mat.GetNbRows()) {
! if(classid == mxUNKNOWN_CLASS) {
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
! }
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
! }
! else {
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(), classid, mxREAL);
! switch(classid) {
! case mxDOUBLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxSINGLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT8_CLASS :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt1 *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT16_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT8_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT16_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
}
}
if(data)
***************
*** 363,469 ****
mxArray *data = 0;
!
! if(classid == mxUNKNOWN_CLASS) {
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
}
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
}
}
- else {
- data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(), classid, mxREAL);
- switch(classid) {
- case mxDOUBLE_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxSINGLE_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT8_CLASS :
- data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt1 *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT16_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxINT32_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT8_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT16_CLASS:
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- case mxUINT32_CLASS :
- for(int ic=0;ic!=mat.GetNbCols();++ic)
- mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
- break;
- default:
- char tmperr[256];
- sprintf(tmperr,"Unsupported data type %x",mat.GetType());
- mexErrMsgTxt(tmperr);
- }
- }
-
if(data)
mxSetCell(mxData,ii+im,data);
--- 366,472 ----
mxArray *data = 0;
! if(mat.GetNbRows()) {
! if(classid == mxUNKNOWN_CLASS) {
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
! }
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
}
! else {
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(), classid, mxREAL);
! switch(classid) {
! case mxDOUBLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxSINGLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT8_CLASS :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt1 *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT16_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT8_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT16_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
}
}
if(data)
mxSetCell(mxData,ii+im,data);
|
|
From: Axel R. <ro...@us...> - 2011-07-12 13:21:44
|
Update of /cvsroot/sdif/Easdif/matlab In directory vz-cvs-3.sog:/tmp/cvs-serv30282 Modified Files: CMakeLists.txt Log Message: Bumped up version number. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/matlab/CMakeLists.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CMakeLists.txt 28 Mar 2011 23:03:18 -0000 1.10 --- CMakeLists.txt 12 Jul 2011 13:21:42 -0000 1.11 *************** *** 1,5 **** SET(EASDIF_MATLAB_VERSION_MAJ 1) SET(EASDIF_MATLAB_VERSION_MIN 1) ! SET(EASDIF_MATLAB_VERSION_REL 0) MESSAGE(STATUS "-------------------------------------------------") --- 1,5 ---- SET(EASDIF_MATLAB_VERSION_MAJ 1) SET(EASDIF_MATLAB_VERSION_MIN 1) ! SET(EASDIF_MATLAB_VERSION_REL 1) MESSAGE(STATUS "-------------------------------------------------") |
|
From: Axel R. <ro...@us...> - 2011-07-12 10:47:19
|
Update of /cvsroot/sdif/SDIF
In directory vz-cvs-3.sog:/tmp/cvs-serv15956/SDIF
Modified Files:
CMakeLists.txt
Log Message:
Support selecting target architecture to be able to properly handle
target architecture depending on installed matlab version.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CMakeLists.txt 11 Jun 2011 23:39:38 -0000 1.25
--- CMakeLists.txt 12 Jul 2011 10:47:17 -0000 1.26
***************
*** 308,311 ****
--- 308,313 ----
CREATE_CVSTAG_TARGET("SDIF_${SDIF_VERSION_MAJ}_${SDIF_VERSION_MIN}_${SDIF_VERSION_RELEASE}")
+ INCLUDE(SET_COMPILER_FLAGS)
+
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
|
|
From: Axel R. <ro...@us...> - 2011-07-12 10:46:06
|
Update of /cvsroot/sdif/Easdif/matlab
In directory vz-cvs-3.sog:/tmp/cvs-serv15883/matlab
Modified Files:
Fsdif_read_handler.cpp Fsdifloadfile.m
Log Message:
Support Fsdifloadfile to force output type.
Index: Fsdifloadfile.m
===================================================================
RCS file: /cvsroot/sdif/Easdif/matlab/Fsdifloadfile.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Fsdifloadfile.m 22 Jan 2008 01:10:44 -0000 1.2
--- Fsdifloadfile.m 12 Jul 2011 10:46:03 -0000 1.3
***************
*** 3,11 ****
%
% USAGE
! % [ data, header, frame, matrix, dims ] = Fsdifloadfile (name)
%
% where data{i} is the matrix at time header(i, 1) in stream header(i, 2)
% with signatures char(frame(i)), char(matrix(i)) and of size dims{i}.
! %
%
% SEE ALSO
--- 3,17 ----
%
% USAGE
! % [ data, header, frame, matrix, dims ] = Fsdifloadfile (name, classid)
%
% where data{i} is the matrix at time header(i, 1) in stream header(i, 2)
% with signatures char(frame(i)), char(matrix(i)) and of size dims{i}.
! %
! % INPUT:
! % name : filename to read
! % classid: optional matlab class string. If not specified
! % sdiftypes that are used in the file will be used for the output
! % matrices. if specified output types will be forced to be of the
! % specified type.
%
% SEE ALSO
***************
*** 21,25 ****
% Copyright (c) 2008 by IRCAM
%
! function [ data, header, frame, matrix, dims ] = Fsdifloadfile (name, types)
if( ~Fsdifexist(name))
--- 27,31 ----
% Copyright (c) 2008 by IRCAM
%
! function [ data, header, frame, matrix, dims ] = Fsdifloadfile (name, force_type)
if( ~Fsdifexist(name))
***************
*** 30,42 ****
switch nargout
case {1}
! data = Fsdif_read_handler('loadfile',file);
case {2}
! [data header] = Fsdif_read_handler('loadfile',file);
case {3}
! [data header frame] = Fsdif_read_handler('loadfile',file);
case {4}
! [data header frame matrix] = Fsdif_read_handler('loadfile',file);
case {5}
! [data header frame matrix dims] = Fsdif_read_handler('loadfile',file);
end
Fsdif_read_handler('close',file);
--- 36,68 ----
switch nargout
case {1}
! if(nargin == 2)
! data = Fsdif_read_handler('loadfile',file, force_type);
! else
! data = Fsdif_read_handler('loadfile',file);
! end
case {2}
! if(nargin == 2)
! [data header] = Fsdif_read_handler('loadfile',file, force_type);
! else
! [data header] = Fsdif_read_handler('loadfile',file);
! end
case {3}
! if(nargin == 2)
! [data header frame] = Fsdif_read_handler('loadfile',file, force_type);
! else
! [data header frame] = Fsdif_read_handler('loadfile',file);
! end
case {4}
! if(nargin == 2)
! [data header frame matrix] = Fsdif_read_handler('loadfile',file, force_type);
! else
! [data header frame matrix] = Fsdif_read_handler('loadfile',file);
! end
case {5}
! if(nargin == 2)
! [data header frame matrix dims] = Fsdif_read_handler('loadfile',file, force_type);
! else
! [data header frame matrix dims] = Fsdif_read_handler('loadfile',file);
! end
end
Fsdif_read_handler('close',file);
Index: Fsdif_read_handler.cpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/matlab/Fsdif_read_handler.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Fsdif_read_handler.cpp 28 Mar 2011 23:03:18 -0000 1.15
--- Fsdif_read_handler.cpp 12 Jul 2011 10:46:03 -0000 1.16
***************
*** 320,323 ****
--- 320,324 ----
void
createMData(Easdif::SDIFEntity::const_iterator& it, int& ii, mxArray *mxData,
+ mxClassID classid,
mxArray *mxHead, mxArray *mxFrame, mxArray *mxMatrix, mxArray* mxDims) {
if(mxData){
***************
*** 362,422 ****
mxArray *data = 0;
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
}
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
if(data)
mxSetCell(mxData,ii+im,data);
--- 363,469 ----
mxArray *data = 0;
!
! if(classid == mxUNKNOWN_CLASS) {
! switch(mat.GetType()) {
! case eFloat4:
! case eFloat4a:
! case eFloat4b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxSINGLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eFloat8:
! case eFloat8a:
! case eFloat8b:
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxDOUBLE_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<unsigned char *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt1 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt2 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT16_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eUInt4 :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxUINT32_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case eText:{
! std::string str;
! mat.Get(str);
! data = mxCreateString(str.c_str());
! break;
! }
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
}
! else {
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(), classid, mxREAL);
! switch(classid) {
! case mxDOUBLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<double*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxSINGLE_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<float*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT8_CLASS :
! data = mxCreateNumericMatrix(mat.GetNbRows(),mat.GetNbCols(),mxINT8_CLASS,mxREAL);
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt1 *> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT16_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT8_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt1*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT16_CLASS:
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt2*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! case mxUINT32_CLASS :
! for(int ic=0;ic!=mat.GetNbCols();++ic)
! mat.GetCol(reinterpret_cast<SdifUInt4*> (mxGetData(data))+ic*mat.GetNbRows(),ic);
! break;
! default:
! char tmperr[256];
! sprintf(tmperr,"Unsupported data type %x",mat.GetType());
! mexErrMsgTxt(tmperr);
! }
! }
!
if(data)
mxSetCell(mxData,ii+im,data);
***************
*** 1085,1094 ****
else if(!strcmp(command,"loadfile")){
! if(nrhs != 2)
! mexErrMsgTxt ("Fsdif_read_handler::Wrong number of input arguments, need to have filname and eventually a selectionmask");
if(nlhs > 5)
mexErrMsgTxt ("Fsdif_read_handler::Wrong number of output arguments (at most 4 )");
if(mxIsInt32(prhs[1]) || mxIsInt64(prhs[1]) || mxIsUint32(prhs[1]) || mxIsUint64(prhs[1])){
Easdif::SDIFEntity *p = *reinterpret_cast<Easdif::SDIFEntity **>(mxGetData(prhs[1]));
--- 1132,1146 ----
else if(!strcmp(command,"loadfile")){
! if(nrhs < 2 || nrhs > 3)
! mexErrMsgTxt ("Fsdif_read_handler::Wrong number of input arguments, need to have filname and eventually a output data type specification");
if(nlhs > 5)
mexErrMsgTxt ("Fsdif_read_handler::Wrong number of output arguments (at most 4 )");
+ mxClassID classid = mxUNKNOWN_CLASS;
+ if(nrhs == 3) {
+ classid = getClassFromString(prhs[2]);
+ }
+
if(mxIsInt32(prhs[1]) || mxIsInt64(prhs[1]) || mxIsUint32(prhs[1]) || mxIsUint64(prhs[1])){
Easdif::SDIFEntity *p = *reinterpret_cast<Easdif::SDIFEntity **>(mxGetData(prhs[1]));
***************
*** 1126,1130 ****
for(int iMat=0; itl->second != ite; ++(itl->second)){
! createMData(itl->second, iMat, mxData, mxHead, mxFrame, mxMatrix, mxDims);
}
}
--- 1178,1182 ----
for(int iMat=0; itl->second != ite; ++(itl->second)){
! createMData(itl->second, iMat, mxData, classid, mxHead, mxFrame, mxMatrix, mxDims);
}
}
|
|
From: Axel R. <ro...@us...> - 2011-06-11 23:58:06
|
Update of /cvsroot/sdif/SDIF/sdif In directory vz-cvs-3.sog:/tmp/cvs-serv13508 Modified Files: SdifFile.c Log Message: Added missing include file io.h. Index: SdifFile.c =================================================================== RCS file: /cvsroot/sdif/SDIF/sdif/SdifFile.c,v retrieving revision 3.64 retrieving revision 3.65 diff -C2 -d -r3.64 -r3.65 *** SdifFile.c 11 Jun 2011 17:29:06 -0000 3.64 --- SdifFile.c 11 Jun 2011 23:58:04 -0000 3.65 *************** *** 34,37 **** --- 34,40 ---- * * $Log$ + * Revision 3.65 2011/06/11 23:58:04 roebel + * Added missing include file io.h. + * * Revision 3.64 2011/06/11 17:29:06 roebel * Fixed ftruncate implementation on windows. *************** *** 361,364 **** --- 364,370 ---- #include "sdiftypes.h" + #ifdef WIN32 + #include <io.h> + #endif /* include file version in object code, to be extracted with "ident libsdif.a" */ |
|
From: Axel R. <ro...@us...> - 2011-06-11 23:39:40
|
Update of /cvsroot/sdif/SDIF
In directory vz-cvs-3.sog:/tmp/cvs-serv7823
Modified Files:
CMakeLists.txt
Log Message:
Reuse simple configure_file function because we finally don't need the more advanced
regexp mechanism.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CMakeLists.txt 11 Jun 2011 23:23:10 -0000 1.24
--- CMakeLists.txt 11 Jun 2011 23:39:38 -0000 1.25
***************
*** 295,313 ****
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif_version.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h)
!
! #CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
! FILE(READ ${PROJECT_SOURCE_DIR}/include/sdif.h.in SDIF_H_CONFIG)
! STRING(REGEX REPLACE "#undef[ \t]*\([^ \t\n\r]*\)" "#cmakedefine \\1 @\\1@" SDIF_H_CMCONFIG ${SDIF_H_CONFIG})
! STRING(CONFIGURE ${SDIF_H_CMCONFIG} SDIF_H_CMCONFIGURED)
!
! IF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
! FILE(READ ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h CURRENT_SDIF_H)
! ENDIF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
!
! IF(NOT "${CURRENT_SDIF_H}" STREQUAL "${SDIF_H_CMCONFIGURED}")
! MESSAGE(STATUS "Writing sdif.h")
! FILE(WRITE ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h ${SDIF_H_CMCONFIGURED})
! ENDIF(NOT "${CURRENT_SDIF_H}" STREQUAL "${SDIF_H_CMCONFIGURED}")
!
# include special traget to remove cache, system and compiler info
--- 295,299 ----
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif_version.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h)
! CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
# include special traget to remove cache, system and compiler info
|
|
From: Axel R. <ro...@us...> - 2011-06-11 23:24:53
|
Update of /cvsroot/sdif/SDIF In directory vz-cvs-3.sog:/tmp/cvs-serv3794 Modified Files: ChangeLog Log Message: Updated ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/sdif/SDIF/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** ChangeLog 7 Jan 2009 17:16:25 -0000 1.62 --- ChangeLog 11 Jun 2011 23:24:51 -0000 1.63 *************** *** 1,2 **** --- 1,196 ---- + 2011-06-11 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt, configure.in, include/sdif.h.in: + Fixed a number of issues with the conditional include of stdint.h and sys/types.h in instaled include file + sdif.h. + Correctly use the types provided by these include files for definition of sdif types. + + * sdif/SdifFile.c: Fixed ftruncate implementation on windows. + + 2011-04-19 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt: Fixed source location for installation of sdif.h; + + 2011-04-18 Axel Roebel <roebel@m1873.local> + + * include/sdif.h.in: added sdif.h.in to cvs + + 2011-04-15 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt, configure.in, include/sdif.h: + fixed use of stdint.h to be persistent in sdif.h even after + installation. + Added a complete configuration search to determine + SdiffPosT type such that it becomes a 64bit type. + + * sdif/SdifSignatureTab.c, sdif/SdifTimePosition.c: + Use double quotes not <> for sdif.h include file. + + * sdif/SdifString.c: Added missing header sdif_portability.h + + 2011-04-12 Axel Roebel <roebel@m1873.local> + + * CMakeLists.txt, README, configure.in, include/sdif.h, sdif/SdifErrMess.c, sdif/SdifFile.c: + Fixed large file support to properly work on linux as well. + + * tools/querysdif.c: + Removed unused variable, and fixed return code to be nonzero in case file is empty. + + * test/cmd_testcheck: + Output error message in case querysdif program fails. + + * include/sdif.h, sdif/SdifErrMess.c, sdif/SdifFile.c: + Fixed Sdif[fF]GetPos and Sdif[fF]SetPos to correctly support large files (>2GB). + + 2011-04-06 diemo <diemo@m1873.local> + + * ReleaseNotes: v3.11.3 preview + + * include/sdif.h, sdif/SdifHighLevel.c: realloc query tree + + * configure.in: v3.11.3 + + 2011-03-29 Axel Roebel <roebel@m1873.local> + + * cmModules/REDIRECT_COMPILERS_TO_SYSROOT.cmake: + Disabled redirection which can established by standard cmake means starting with cmake 2.8. + SYSROOT manipulation is only required for binary distribution which om now can be done only with + cmake internal means. + + 2009-10-29 Axel Roebel <roebel@m1873.local> + + * sdif/SdifMatrix.c, sdif/SdifSelect.c: Fixed memory leaks. + + * CMakeLists.txt, test/CMakeLists.txt, tools/CMakeLists.txt: + Modified to use cmake 2.6 output directory selection. + + 2009-10-19 diemo <diemo@m1873.local> + + * Makefile.am: new upload host and dir, again + + * include/sdif.h: added prototype for SdifFreeQueryTree + + 2009-08-11 diemo <diemo@m1873.local> + + * doc/standard/sdif-standard.html, doc/Makefile.am: + Remove standards doc and publication make rule, since + SDIF documentation has moved to the sdif-website CVS module + + * doc/standard/sdif-standard.html: updated nvt syntax + + 2009-08-10 diemo <diemo@m1873.local> + + * types/Makefile: nl + + * sdif/SdifHighLevel.c: + fix matrix selection for SdifQuery: In SdifReadFile function, check if + matrix header is selected before calling matrix callback. + + * doc/standard/sdif-standard.html: + correct description of matrix data type, thanks to Matt Wright for pointing this out! + + * configure.in: version 3.11.2 + + * doc/Makefile.am: new server for web files, + update standards doc also + + * Makefile.am: frs changed again... + + * ReleaseNotes: version 3.11.2 + + * tools/sdiftotext.c: accept in/outfile without -i/-o also + + * tools/querysdif.c: + - added flags to switch header, nvt, and type def printing + + * tools/querysdif.c: + - reimplemented querysdif using SdifQuery for consistency + - added header printing + + 2009-04-20 diemo <diemo@m1873.local> + + * include/sdif.h: example for SdifSelectAddSignature + move SDIF_API out of generating macro, to avoid it in SdifSelect.c (error on windows compilation) + + * include/sdif.h: document two missing prototypes + + * sdif.sln, sdif.vcproj: updated for Windows compilation + + 2009-04-17 diemo <diemo@m1873.local> + + * include/sdif.h, sdif/SdifSelect.c: + clarified syntax in code-generating macro + + 2009-04-09 diemo <diemo@m1873.local> + + * macosxbuild/README.MacOSX: doc building under SDK and UB on Mac + + * sdif/SdifHighLevel.c: comm + + * examples/Makefile.am: force linking with freshly built lib + + * macosxbuild/SDIF.xcodeproj/project.pbxproj: version 3.11.1 + + * examples/list-nvt.c: remove unused + + 2009-02-18 Axel Roebel <roebel@m1873.local> + + * cmModules/REDIRECT_COMPILERS_TO_SYSROOT.cmake: + Added support for -mmacosx-version-min in case a specific SYSROOT is selected + + * cmModules/GET_GCC_VERSION.cmake: + Protect againstb calling with non gcc compilers + + 2009-02-18 diemo <diemo@m1873.local> + + * autogen.sh: on mac, avoid warnings, try glibtoolize first + + * macosxbuild/SDIF.xcodeproj/Makefile.am: + empty makefile just to include Mac xcode compilation project in source distribution + + 2009-02-05 Axel Roebel <roebel@m1873.local> + + * test/CMakeLists.txt: Adapted for cmake 2.6.0 + + * CMakeLists.txt: Enforce to use cmake 2.6.0 + + 2009-01-27 Axel Roebel <roebel@m1873.local> + + * doc/window-enumeration.txt: + Added window type enumeration information text to SDIF doc. + + 2009-01-07 diemo <diemo@m1873.local> + + * ChangeLog, ReleaseNotes: notes for 3.11.1 + + * configure.in: bump up release to 3.11.1 + + * include/sdif.h: + access functions for integration in script languages for all fields of: + - name-value table list global struct SdifNameValuesLT (-> list of tables), + - name-value table SdifNameValueTableT (-> hash of entries), + - name-value entry SdifNameValueT + iterator to iterate over all entries in hash table + + * sdif/SdifHash.c: + iterator for integration in script languages to iterate over all entries in hash table + + * sdif/SdifNameValue.c: + access functions for integration in script languages for all fields of: + - name-value table list global struct SdifNameValuesLT (-> list of tables), + - name-value table SdifNameValueTableT (-> hash of entries), + - name-value entry SdifNameValueT + + * examples/list-nvt.c: + use new nvt access functions and hash table iterator + + * examples/Makefile.am: link list-nvt example with freshly built lib + + * Makefile.am: include examples dir in target and dist + + * examples/Makefile.am: added nvt listing example + + * examples/list-nvt.c: nvt listing example for library version <= 3.10 + 2009-01-07 diemo <diemo@here> Version 3.11.1 |
|
From: Axel R. <ro...@us...> - 2011-06-11 23:23:13
|
Update of /cvsroot/sdif/SDIF/include In directory vz-cvs-3.sog:/tmp/cvs-serv3516/SDIF/include Modified Files: sdif.h.in Log Message: Fixed a number of issues with the conditional include of stdint.h and sys/types.h in instaled include file sdif.h. Correctly use the types provided by these include files for definition of sdif types. Index: sdif.h.in =================================================================== RCS file: /cvsroot/sdif/SDIF/include/sdif.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sdif.h.in 18 Apr 2011 18:46:27 -0000 1.1 --- sdif.h.in 11 Jun 2011 23:23:10 -0000 1.2 *************** *** 31,34 **** --- 31,39 ---- * * $Log$ + * Revision 1.2 2011/06/11 23:23:10 roebel + * Fixed a number of issues with the conditional include of stdint.h and sys/types.h in instaled include file + * sdif.h. + * Correctly use the types provided by these include files for definition of sdif types. + * * Revision 1.1 2011/04/18 18:46:27 roebel * added sdif.h.in to cvs *************** *** 350,361 **** static const char _sdif_h_cvs_revision_ [] = "$Id$"; ! /* these all will be configured and the result will be ! kept in the installed version of sdif.h */ ! #define HAVE_STDINT_HEADER @HAVE_STDINT_H@ ! #if defined(HAVE_STDINT_HEADER) && HAVE_STDINT_HEADER # include <stdint.h> #endif ! #define HAVE_SYS_TYPES_HEADER @HAVE_SYS_TYPES_H@ ! #if defined(HAVE_SYS_TYPES_HEADER) && HAVE_SYS_TYPES_HEADER # include <sys/types.h> #endif --- 355,371 ---- static const char _sdif_h_cvs_revision_ [] = "$Id$"; ! /* the following two #if are configured by autoconf/cmake ! * and reflect capabilities of the installing compiler. ! * You cannot use an installed sdif with a comiler that des not provide ! * stdint.h and/or sys/types.h when the configurin compiler provided those ! */ ! /* will be 0 if HAVE_STDINT_H is not set or set to 0, will be 10 if HAVE_STDINT_H is set */ ! #if @HAVE_STDINT_H@0 ! # define HAVE_STDINT_HEADER 1 # include <stdint.h> #endif ! ! /* will be 0 if HAVE_SYS_TYPES_H is not set or set to 0, will be 10 if HAVE_SYS_TYPES_H is set */ ! #if @HAVE_SYS_TYPES_H@0 # include <sys/types.h> #endif *************** *** 548,552 **** /* SdifHard_OS.h */ ! #ifdef HAVE_STDINT_H typedef char SdifChar; typedef char SdifInt1; --- 558,562 ---- /* SdifHard_OS.h */ ! #ifdef HAVE_STDINT_HEADER typedef char SdifChar; typedef char SdifInt1; |
|
From: Axel R. <ro...@us...> - 2011-06-11 17:29:08
|
Update of /cvsroot/sdif/SDIF/sdif
In directory vz-cvs-3.sog:/tmp/cvs-serv24178
Modified Files:
SdifFile.c
Log Message:
Fixed ftruncate implementation on windows.
Index: SdifFile.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/SdifFile.c,v
retrieving revision 3.63
retrieving revision 3.64
diff -C2 -d -r3.63 -r3.64
*** SdifFile.c 12 Apr 2011 20:17:32 -0000 3.63
--- SdifFile.c 11 Jun 2011 17:29:06 -0000 3.64
***************
*** 34,37 ****
--- 34,40 ----
*
* $Log$
+ * Revision 3.64 2011/06/11 17:29:06 roebel
+ * Fixed ftruncate implementation on windows.
+ *
* Revision 3.63 2011/04/12 20:17:32 roebel
* Fixed large file support to properly work on linux as well.
***************
*** 1374,1378 ****
#else
# if defined(WIN32)
! return __chsize_s(_fileno(file->Stream), pos) == 0);
# else
return SDIFFTRUNCATE_NOT_AVAILABLE;
--- 1377,1387 ----
#else
# if defined(WIN32)
! # if defined(_MSC_VER) && _MSC_VER >= 1400
! // 64bit pos
! return (_chsize_s(_fileno(file->Stream), pos) == 0);
! # else
! // 32bit pos
! return (_chsize(_fileno(file->Stream), pos) == 0);
! # endif
# else
return SDIFFTRUNCATE_NOT_AVAILABLE;
|
|
From: Axel R. <ro...@us...> - 2011-06-11 17:15:19
|
Update of /cvsroot/sdif/Easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv21730
Modified Files:
ChangeLog CMakeLists.txt
Log Message:
Version 1.14.4
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** CMakeLists.txt 12 Apr 2011 20:17:55 -0000 1.69
--- CMakeLists.txt 11 Jun 2011 17:15:17 -0000 1.70
***************
*** 40,44 ****
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 12)
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 14)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sdif/Easdif/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** ChangeLog 12 Apr 2011 20:17:55 -0000 1.83
--- ChangeLog 11 Jun 2011 17:15:17 -0000 1.84
***************
*** 1,2 ****
--- 1,19 ----
+ 2011-06-11 Axel Roebel <roebel@m1873.local>
+ Version 1.4.14
+
+ * easdif/sdifmatrixdata.hpp:
+ Moved constructor and destructor definition out of class scope to
+ lower probability of inlining.
+ Changed handling of empty matrices to avoid assertion failures
+ in MSVC.
+
+ * easdif/sdifentity.cpp, easdif/sdifentity.hpp, easdif/sdifexception.cpp, easdif/sdifexception.hpp:
+ Moved some member functions out of class scope to avoid unnecessary inlining
+ of constructor, destructor or other costly functions.
+
+ 2011-05-00 Axel Roebel <roebel@m1873.local>
+ Version 1.4.13 (local changes only)
+
+
2011-04-12 Axel Roebel <roebel@ANA-1873-Roebel.local>
Version 1.4.12
|
|
From: Axel R. <ro...@us...> - 2011-06-11 17:08:18
|
Update of /cvsroot/sdif/Easdif/easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv19793/easdif
Modified Files:
sdifmatrixdata.hpp
Log Message:
Moved constructor and destructor definition out of class scope to
lower probability of inlining.
Changed handling of empty matrices to avoid assertion failures
in MSVC.
Index: sdifmatrixdata.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifmatrixdata.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sdifmatrixdata.hpp 22 Jan 2008 00:51:28 -0000 1.3
--- sdifmatrixdata.hpp 11 Jun 2011 17:08:16 -0000 1.4
***************
*** 37,40 ****
--- 37,46 ----
*
* $Log$
+ * Revision 1.4 2011/06/11 17:08:16 roebel
+ * Moved constructor and destructor definition out of class scope to
+ * lower probability of inlining.
+ * Changed handling of empty matrices to avoid assertion failures
+ * in MSVC.
+ *
* Revision 1.3 2008/01/22 00:51:28 roebel
* Completed support for all sdif integer types.
***************
*** 250,270 ****
public:
! SDIFMatrixData(int nrows, int ncols)
! {
! if (nrows<0|| ncols<0 )
! {
! m_Nrows=0;
! m_Ncols=0;
! m_Data.resize(0);
! }
! m_Nrows = nrows;
! m_Ncols = ncols;
! m_Data.resize(m_Nrows*m_Ncols);
! };
!
! ~SDIFMatrixData()
! {
! };
!
--- 256,261 ----
public:
! SDIFMatrixData(int nrows, int ncols);
! ~SDIFMatrixData();
***************
*** 304,308 ****
void _GetRow(TT* out,int irow) const throw (SDIFArrayPosition)
{
! if (irow<0 || irow >= m_Nrows) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::GetRow!!! requested row is out of range !!!",
--- 295,299 ----
void _GetRow(TT* out,int irow) const throw (SDIFArrayPosition)
{
! if (irow<0 || irow >= m_Nrows || m_Data.empty()) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::GetRow!!! requested row is out of range !!!",
***************
*** 329,333 ****
void _GetCol(TT* out,int icol) const throw (SDIFArrayPosition)
{
! if (icol<0 || icol >= m_Ncols) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::GetCol!!! requested column is out of range !!!",
--- 320,324 ----
void _GetCol(TT* out,int icol) const throw (SDIFArrayPosition)
{
! if (icol<0 || icol >= m_Ncols || m_Data.empty()) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::GetCol!!! requested column is out of range !!!",
***************
*** 660,665 ****
size_t bytesread = 0;
/*Read matrix data*/
!
! if( m_Nrows == _rows && m_Ncols == _cols ) {
bytesread += SdiffReadMatrix(&m_Data[0],_rows*_cols,file);
}
--- 651,656 ----
size_t bytesread = 0;
/*Read matrix data*/
!
! if( m_Nrows == _rows && m_Ncols == _cols && !m_Data.empty() ) {
bytesread += SdiffReadMatrix(&m_Data[0],_rows*_cols,file);
}
***************
*** 699,703 ****
size_t SizeFrameW = 0;
/* Write matrix data */
! SizeFrameW += SdiffWriteMatrix(&m_Data[0],m_Nrows*m_Ncols,file);
/* Write matrix padding */
--- 690,695 ----
size_t SizeFrameW = 0;
/* Write matrix data */
! if (!m_Data.empty())
! SizeFrameW += SdiffWriteMatrix(&m_Data[0],m_Nrows*m_Ncols,file);
/* Write matrix padding */
***************
*** 760,764 ****
*/
void Clear() {
! std::fill(&m_Data[0],&m_Data[0]+m_Data.size(),T(0));
}
--- 752,756 ----
*/
void Clear() {
! std::fill(m_Data.begin(),m_Data.end(),T(0));
}
***************
*** 929,933 ****
void _SetRow(const TT* in,int irow) throw (SDIFArrayPosition)
{
! if (irow<0 || irow >= m_Nrows) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::SetRow!!! requested row is out of range !!!",
--- 921,925 ----
void _SetRow(const TT* in,int irow) throw (SDIFArrayPosition)
{
! if (irow<0 || irow >= m_Nrows || m_Data.empty()) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::SetRow!!! requested row is out of range !!!",
***************
*** 954,958 ****
void _SetCol(const TT* in,int icol) throw (SDIFArrayPosition)
{
! if (icol<0 || icol >= m_Ncols) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::SetCol!!! requested column is out of range !!!",
--- 946,950 ----
void _SetCol(const TT* in,int icol) throw (SDIFArrayPosition)
{
! if (icol<0 || icol >= m_Ncols || m_Data.empty()) {
throw SDIFArrayPosition(eError,
"Error in SDIFMatrixData::SetCol!!! requested column is out of range !!!",
***************
*** 1173,1176 ****
--- 1165,1184 ----
};
+
+ template <class T>
+ SDIFMatrixData<T>::SDIFMatrixData(int nrows, int ncols) {
+ if (nrows<0|| ncols<0 ) {
+ m_Nrows=0;
+ m_Ncols=0;
+ m_Data.resize(0);
+ }
+ m_Nrows = nrows;
+ m_Ncols = ncols;
+ m_Data.resize(m_Nrows*m_Ncols);
+ };
+
+ template <class T>
+ SDIFMatrixData<T>::~SDIFMatrixData(){};
+
} // end of namespace Easdif
|
|
From: Axel R. <ro...@us...> - 2011-06-11 17:05:34
|
Update of /cvsroot/sdif/Easdif/easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv18354/easdif
Modified Files:
sdifexception.hpp sdifexception.cpp sdifentity.hpp
sdifentity.cpp
Log Message:
Moved some member functions out of class scope to avoid unnecessary inlining
of constructor, destructor or other costly functions.
Index: sdifexception.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifexception.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sdifexception.hpp 28 Jul 2008 16:19:57 -0000 1.6
--- sdifexception.hpp 11 Jun 2011 17:05:31 -0000 1.7
***************
*** 38,41 ****
--- 38,45 ----
*
* $Log$
+ * Revision 1.7 2011/06/11 17:05:31 roebel
+ * Moved some member functions out of class scope to avoid unnecessary inlining
+ * of constructor, destructor or other costly functions.
+ *
* Revision 1.6 2008/07/28 16:19:57 roebel
* Added all derived exceptions to the public API
***************
*** 157,179 ****
int error, // either SdifErrorE or SdifErrorTagE
const char* sourceFileName,
! int sourceFileLine) {
!
! mSourceFileLine = sourceFileLine;
! if(sourceFileName)
! mSourceFileName = std::string(sourceFileName);
! else
! mSourceFileName = std::string("");
!
! if(message)
! mMessage = std::string(message);
! else
! mMessage = std::string("");
!
! mLevel = level;
! mSdifFile = _sdifFile;
! mError = error;
! };
! ~SDIFException() throw() { };
/**
--- 161,167 ----
int error, // either SdifErrorE or SdifErrorTagE
const char* sourceFileName,
! int sourceFileLine);
! ~SDIFException() throw() ;
/**
***************
*** 262,268 ****
#define constructor(class1,class2) class1(SdifErrorLevelET level, const char* message, \
SdifFileT* _sdifFile, int error, \
! const char* sourceFileName, int sourceFileLine) \
! : class2(level,message,_sdifFile,error,sourceFileName,sourceFileLine){} \
! ~class1() throw() {}
/****************** FILE ERRORS *************************/
--- 250,255 ----
#define constructor(class1,class2) class1(SdifErrorLevelET level, const char* message, \
SdifFileT* _sdifFile, int error, \
! const char* sourceFileName, int sourceFileLine); \
! ~class1() throw();
/****************** FILE ERRORS *************************/
Index: sdifexception.cpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifexception.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sdifexception.cpp 26 Nov 2007 19:09:48 -0000 1.7
--- sdifexception.cpp 11 Jun 2011 17:05:31 -0000 1.8
***************
*** 31,34 ****
--- 31,127 ----
namespace Easdif {
+
+ SDIFException::SDIFException(SdifErrorLevelET level,
+ const char* message,
+ SdifFileT* _sdifFile,
+ int error, // either SdifErrorE or SdifErrorTagE
+ const char* sourceFileName,
+ int sourceFileLine) {
+
+ mSourceFileLine = sourceFileLine;
+ if(sourceFileName)
+ mSourceFileName = std::string(sourceFileName);
+ else
+ mSourceFileName = std::string("");
+
+ if(message)
+ mMessage = std::string(message);
+ else
+ mMessage = std::string("");
+
+ mLevel = level;
+ mSdifFile = _sdifFile;
+ mError = error;
+ };
+
+ SDIFException::~SDIFException() throw() {
+ };
+
+ #define constructor_impl(class1,class2) class1::class1(SdifErrorLevelET level, const char* message, \
+ SdifFileT* _sdifFile, int error, \
+ const char* sourceFileName, int sourceFileLine) \
+ : class2(level,message,_sdifFile,error,sourceFileName,sourceFileLine){}
+
+ constructor_impl(SDIFFileError,SDIFException)
+ constructor_impl(SDIFOpeningError,SDIFFileError)
+ constructor_impl(SDIFReadWriteOnSameFile,SDIFOpeningError)
+ constructor_impl(SDIFBadStdFile,SDIFOpeningError)
+ constructor_impl(SDIFBadMode,SDIFOpeningError)
+ constructor_impl(SDIFHeaderError,SDIFFileError)
+ constructor_impl(SDIFFrameHeaderSizeError,SDIFFileError)
+ constructor_impl(SDIFDirError,SDIFFileError)
+ constructor_impl(SDIFSeekError,SDIFFileError)
+ constructor_impl(SDIFBadFormatVersion,SDIFHeaderError)
+ constructor_impl(SDIFBadHeader,SDIFHeaderError)
+ constructor_impl(SDIFAsciiChunkError,SDIFFileError)
+ constructor_impl(SDIFReDefined,SDIFAsciiChunkError)
+ constructor_impl(SDIFUnDefined,SDIFAsciiChunkError)
+ constructor_impl(SDIFReading,SDIFFileError)
+ constructor_impl(SDIFEof,SDIFReading)
+ constructor_impl(SDIFDescriptionTypeError,SDIFException)
+ constructor_impl(SDIFMatrixDataError,SDIFException)
+ constructor_impl(SDIFNotInDataTypeUnion,SDIFMatrixDataError)
+ constructor_impl(SDIFArrayPosition,SDIFMatrixDataError)
+ constructor_impl(SDIFMemoryError,SDIFException)
+ constructor_impl(SDIFFreeNull,SDIFMemoryError)
+ constructor_impl(SDIFAllocFail,SDIFMemoryError)
+ constructor_impl(SDIFTextReadingError,SDIFException)
+ constructor_impl(SDIFMatrixNotAvailable,SDIFException)
+ constructor_impl(SDIFTokenLength,SDIFTextReadingError)
+ constructor_impl(FrameDirError,SDIFException)
+ constructor_impl(TypeError,SDIFException)
+
+
+ #define destructor(class1) class1::~class1() throw() {}
+
+ destructor(SDIFFileError)
+ destructor(SDIFOpeningError)
+ destructor(SDIFReadWriteOnSameFile)
+ destructor(SDIFBadStdFile)
+ destructor(SDIFBadMode)
+ destructor(SDIFHeaderError)
+ destructor(SDIFFrameHeaderSizeError)
+ destructor(SDIFDirError)
+ destructor(SDIFSeekError)
+ destructor(SDIFBadFormatVersion)
+ destructor(SDIFBadHeader)
+ destructor(SDIFAsciiChunkError)
+ destructor(SDIFReDefined)
+ destructor(SDIFUnDefined)
+ destructor(SDIFReading)
+ destructor(SDIFEof)
+ destructor(SDIFDescriptionTypeError)
+ destructor(SDIFMatrixDataError)
+ destructor(SDIFNotInDataTypeUnion)
+ destructor(SDIFArrayPosition)
+ destructor(SDIFMemoryError)
+ destructor(SDIFFreeNull)
+ destructor(SDIFAllocFail)
+ destructor(SDIFTextReadingError)
+ destructor(SDIFTokenLength)
+ destructor(SDIFMatrixNotAvailable)
+ destructor(FrameDirError)
+ destructor(TypeError)
+
extern "C" {
Index: sdifentity.hpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifentity.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** sdifentity.hpp 16 Apr 2010 10:39:44 -0000 1.24
--- sdifentity.hpp 11 Jun 2011 17:05:31 -0000 1.25
***************
*** 36,39 ****
--- 36,43 ----
*
* $Log$
+ * Revision 1.25 2011/06/11 17:05:31 roebel
+ * Moved some member functions out of class scope to avoid unnecessary inlining
+ * of constructor, destructor or other costly functions.
+ *
* Revision 1.24 2010/04/16 10:39:44 roebel
* Fixed/clarified documentation.
***************
*** 537,545 ****
*
*/
! struct MatrixType {
SdifSignature mSig;
std::vector<std::string> mvColumnNames;
MatrixType() :mSig(eEmptySignature) {}
MatrixType(SdifSignature sig) :mSig(sig) {}
/**
--- 541,550 ----
*
*/
! struct EASDIF_API MatrixType {
SdifSignature mSig;
std::vector<std::string> mvColumnNames;
MatrixType() :mSig(eEmptySignature) {}
MatrixType(SdifSignature sig) :mSig(sig) {}
+ ~MatrixType();
/**
***************
*** 606,610 ****
*
*/
! struct FrameType {
SdifSignature mSig;
std::vector<std::string> mvMatrixNames;
--- 611,615 ----
*
*/
! struct EASDIF_API FrameType {
SdifSignature mSig;
std::vector<std::string> mvMatrixNames;
***************
*** 613,616 ****
--- 618,622 ----
FrameType(SdifSignature sig) :mSig(sig) {}
FrameType() : mSig(eEmptySignature) {}
+ ~FrameType();
struct equal_mat : std::equal_to<SdifSignature> {
***************
*** 1001,1008 ****
SDIFEntity();
! ~SDIFEntity()
! {
! Close();
! };
/**
--- 1007,1011 ----
SDIFEntity();
! ~SDIFEntity();
/**
Index: sdifentity.cpp
===================================================================
RCS file: /cvsroot/sdif/Easdif/easdif/sdifentity.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** sdifentity.cpp 8 May 2010 19:35:55 -0000 1.45
--- sdifentity.cpp 11 Jun 2011 17:05:31 -0000 1.46
***************
*** 36,39 ****
--- 36,43 ----
*
* $Log$
+ * Revision 1.46 2011/06/11 17:05:31 roebel
+ * Moved some member functions out of class scope to avoid unnecessary inlining
+ * of constructor, destructor or other costly functions.
+ *
* Revision 1.45 2010/05/08 19:35:55 roebel
* Fixed SDIFEntity::GetStreamSelection to properly establish the selected streams.
***************
*** 272,275 ****
--- 276,282 ----
namespace Easdif {
+ MatrixType::~MatrixType() {}
+ FrameType::~FrameType() {}
+
SDIFEntity::SDIFEntity(): efile(0), mSize(0), mEof(true), mEofSeen(false),
mOpen(0), generalHeader(0), asciiChunks(0),
***************
*** 282,285 ****
--- 289,299 ----
};
+ SDIFEntity::~SDIFEntity()
+ {
+ Close();
+ };
+
+
+
/* to open a file in mode Read */
bool SDIFEntity::OpenRead(const char* filename)
|
|
From: Axel R. <ro...@us...> - 2011-04-19 16:26:35
|
Update of /cvsroot/sdif/SDIF
In directory vz-cvs-3.sog:/tmp/cvs-serv9831/SDIF
Modified Files:
CMakeLists.txt
Log Message:
Fixed source location for installation of sdif.h;
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CMakeLists.txt 15 Apr 2011 23:23:43 -0000 1.22
--- CMakeLists.txt 19 Apr 2011 16:26:32 -0000 1.23
***************
*** 345,349 ****
# install sdif headers
INSTALL(FILES ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h DESTINATION ${INSTALL_INC_DIR})
! INSTALL(FILES ${PROJECT_SOURCE_DIR}/sdifconfig/sdif.h DESTINATION ${INSTALL_INC_DIR})
--- 345,349 ----
# install sdif headers
INSTALL(FILES ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h DESTINATION ${INSTALL_INC_DIR})
! INSTALL(FILES ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h DESTINATION ${INSTALL_INC_DIR})
|
|
From: Axel R. <ro...@us...> - 2011-04-18 18:46:32
|
Update of /cvsroot/sdif/SDIF/include In directory vz-cvs-3.sog:/tmp/cvs-serv29702/SDIF/include Added Files: sdif.h.in Log Message: added sdif.h.in to cvs --- NEW FILE: sdif.h.in --- /* $Id: sdif.h.in,v 1.1 2011/04/18 18:46:27 roebel Exp $ * * IRCAM SDIF Library (http://www.ircam.fr/sdif) * * Copyright (C) 1998-2002 by IRCAM-Centre Georges Pompidou, Paris, France. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file COPYING for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License [...3362 lines suppressed...] SDIF_API size_t SdifFPrintAllType (SdifFileT *SdifF); SDIF_API size_t SdifFPrintAllStreamID (SdifFileT *SdifF); SDIF_API size_t SdifFPrintAllASCIIChunks (SdifFileT *SdifF); SDIF_API size_t SdifFPrintMatrixHeader (SdifFileT *SdifF); SDIF_API size_t SdifFPrintFrameHeader (SdifFileT *SdifF); SDIF_API size_t SdifFPrintOneRow (SdifFileT *SdifF); SDIF_API size_t SdifFPrintMatrixType (SdifFileT *SdifF, SdifMatrixTypeT *MatrixType); SDIF_API size_t SdifFPrintFrameType (SdifFileT *SdifF, SdifFrameTypeT *FrameType); /* SdifFPut */ SDIF_API int SdifFAllFrameTypeToSdifString (SdifFileT *SdifF, SdifStringT *SdifString); SDIF_API int SdifFAllMatrixTypeToSdifString (SdifFileT *SdifF, SdifStringT *SdifSTring); #ifdef __cplusplus } #endif #endif /* _SDIF_H */ |
|
From: Axel R. <ro...@us...> - 2011-04-15 23:23:45
|
Update of /cvsroot/sdif/SDIF/include In directory vz-cvs-3.sog:/tmp/cvs-serv9334/SDIF/include Removed Files: sdif.h Log Message: fixed use of stdint.h to be persistent in sdif.h even after installation. Added a complete configuration search to determine SdiffPosT type such that it becomes a 64bit type. --- sdif.h DELETED --- |
|
From: Axel R. <ro...@us...> - 2011-04-15 23:21:34
|
Update of /cvsroot/sdif/SDIF/sdif In directory vz-cvs-3.sog:/tmp/cvs-serv7930/SDIF/sdif Modified Files: SdifTimePosition.c SdifSignatureTab.c Log Message: Use double quotes not <> for sdif.h include file. Index: SdifSignatureTab.c =================================================================== RCS file: /cvsroot/sdif/SDIF/sdif/SdifSignatureTab.c,v retrieving revision 3.7 retrieving revision 3.8 diff -C2 -d -r3.7 -r3.8 *** SdifSignatureTab.c 26 Nov 2007 18:50:48 -0000 3.7 --- SdifSignatureTab.c 15 Apr 2011 23:21:31 -0000 3.8 *************** *** 31,34 **** --- 31,37 ---- * * $Log$ + * Revision 3.8 2011/04/15 23:21:31 roebel + * Use double quotes not <> for sdif.h include file. + * * Revision 3.7 2007/11/26 18:50:48 roebel * Changed data types to have less casts and *************** *** 63,67 **** #include "sdif_portability.h" ! #include <sdif.h> #include "SdifGlobals.h" --- 66,70 ---- #include "sdif_portability.h" ! #include "sdif.h" #include "SdifGlobals.h" Index: SdifTimePosition.c =================================================================== RCS file: /cvsroot/sdif/SDIF/sdif/SdifTimePosition.c,v retrieving revision 3.9 retrieving revision 3.10 diff -C2 -d -r3.9 -r3.10 *** SdifTimePosition.c 7 Apr 2005 15:56:48 -0000 3.9 --- SdifTimePosition.c 15 Apr 2011 23:21:31 -0000 3.10 *************** *** 33,36 **** --- 33,39 ---- * * $Log$ + * Revision 3.10 2011/04/15 23:21:31 roebel + * Use double quotes not <> for sdif.h include file. + * * Revision 3.9 2005/04/07 15:56:48 schwarz * removed some now empty local include files, *************** *** 85,90 **** #include <stdlib.h> - #include <sdif.h> #include "sdif_portability.h" #include "SdifErrMess.h" --- 88,93 ---- #include <stdlib.h> #include "sdif_portability.h" + #include "sdif.h" #include "SdifErrMess.h" |
|
From: Axel R. <ro...@us...> - 2011-04-15 17:19:09
|
Update of /cvsroot/sdif/SDIF/sdif In directory vz-cvs-3.sog:/tmp/cvs-serv22301 Modified Files: SdifString.c Log Message: Added missing header sdif_portability.h Index: SdifString.c =================================================================== RCS file: /cvsroot/sdif/SDIF/sdif/SdifString.c,v retrieving revision 3.12 retrieving revision 3.13 diff -C2 -d -r3.12 -r3.13 *** SdifString.c 23 May 2005 17:52:53 -0000 3.12 --- SdifString.c 15 Apr 2011 17:19:06 -0000 3.13 *************** *** 33,36 **** --- 33,39 ---- * * $Log$ + * Revision 3.13 2011/04/15 17:19:06 roebel + * Added missing header sdif_portability.h + * * Revision 3.12 2005/05/23 17:52:53 schwarz * Unified error handling: *************** *** 95,99 **** #include <string.h> ! #include <sdif.h> #include "SdifGlobals.h" --- 98,103 ---- #include <string.h> ! #include "sdif_portability.h" ! #include "sdif.h" #include "SdifGlobals.h" |
|
From: Axel R. <ro...@us...> - 2011-04-12 20:17:57
|
Update of /cvsroot/sdif/Easdif
In directory vz-cvs-3.sog:/tmp/cvs-serv21582
Modified Files:
ChangeLog CMakeLists.txt
Log Message:
Enabled large file support for Easdif.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** CMakeLists.txt 8 May 2010 19:41:22 -0000 1.68
--- CMakeLists.txt 12 Apr 2011 20:17:55 -0000 1.69
***************
*** 40,44 ****
SET(EASDIF_VERSION_MAJ 1)
SET(EASDIF_VERSION_MIN 4)
! SET(EASDIF_VERSION_RELEASE 11)
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 12)
SET(EASDIF_VERSION "${EASDIF_VERSION_MAJ}.${EASDIF_VERSION_MIN}.${EASDIF_VERSION_RELEASE}")
***************
*** 107,110 ****
--- 107,114 ----
ENDIF(GCC_HAS_VISIBILITY)
ENDIF(NOT WIN32)
+ # many gcc implementations enable large file support when the
+ # macro _FILE_OFFSET_BITS is compiled. We set it here, it will not harm if gcc does
+ # honor it. In that case we are using the default large file support of the compiler
+ ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sdif/Easdif/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ChangeLog 8 May 2010 19:41:22 -0000 1.82
--- ChangeLog 12 Apr 2011 20:17:55 -0000 1.83
***************
*** 1,2 ****
--- 1,8 ----
+ 2011-04-12 Axel Roebel <roebel@ANA-1873-Roebel.local>
+ Version 1.4.12
+
+ * CMakeLists.txt :
+ Enable large file support ine Easdif and SDIF.
+
2010-05-08 axel roebel <roebel@sam.localdomain>
Version 1.4.11
|
|
From: Axel R. <ro...@us...> - 2011-04-12 20:17:35
|
Update of /cvsroot/sdif/SDIF/sdif
In directory vz-cvs-3.sog:/tmp/cvs-serv21547/SDIF/sdif
Modified Files:
SdifFile.c SdifErrMess.c
Log Message:
Fixed large file support to properly work on linux as well.
Index: SdifErrMess.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/SdifErrMess.c,v
retrieving revision 3.27
retrieving revision 3.28
diff -C2 -d -r3.27 -r3.28
*** SdifErrMess.c 12 Apr 2011 14:18:18 -0000 3.27
--- SdifErrMess.c 12 Apr 2011 20:17:32 -0000 3.28
***************
*** 32,35 ****
--- 32,38 ----
*
* $Log$
+ * Revision 3.28 2011/04/12 20:17:32 roebel
+ * Fixed large file support to properly work on linux as well.
+ *
* Revision 3.27 2011/04/12 14:18:18 roebel
* Fixed Sdif[fF]GetPos and Sdif[fF]SetPos to correctly support large files (>2GB).
***************
*** 418,431 ****
if (SdifF)
{
! long printable_pos = 0;
! if (SdifF->Stream) {
! /* cannot use SdifF->Pos for printing any more but still call SdiffGetPos to not chnage the
! * to keep the internal position info coherent with previous versions of the library */
SdiffGetPos(SdifF->Stream, &(SdifF->Pos));
! printable_pos = ftell(SdifF->Stream);
! }
! if (printable_pos !=0)
! snprintf(PosErrMess, sizeof(PosErrMess), " (byte:%6lu=0x%04lx=0%06lo)",
! printable_pos, printable_pos, printable_pos);
if (SdifF->TextStream)
--- 421,430 ----
if (SdifF)
{
! if (SdifF->Stream)
SdiffGetPos(SdifF->Stream, &(SdifF->Pos));
!
! if (SdifF->Pos !=0)
! snprintf(PosErrMess, sizeof(PosErrMess), " (byte:%6llu=0x%04llx=0%06llo)",
! (long long) SdifF->Pos, (long long) SdifF->Pos, (long long) SdifF->Pos);
if (SdifF->TextStream)
***************
*** 458,462 ****
case eNoError:
case eUnknown:
! snprintf(ErrErrMess, sizeof(ErrErrMess), gSdifErrMessFormat[ErrorTag].UserMess);
break;
--- 457,461 ----
case eNoError:
case eUnknown:
! snprintf(ErrErrMess, sizeof(ErrErrMess), "%s", gSdifErrMessFormat[ErrorTag].UserMess);
break;
Index: SdifFile.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/sdif/SdifFile.c,v
retrieving revision 3.62
retrieving revision 3.63
diff -C2 -d -r3.62 -r3.63
*** SdifFile.c 12 Apr 2011 14:18:18 -0000 3.62
--- SdifFile.c 12 Apr 2011 20:17:32 -0000 3.63
***************
*** 34,37 ****
--- 34,40 ----
*
* $Log$
+ * Revision 3.63 2011/04/12 20:17:32 roebel
+ * Fixed large file support to properly work on linux as well.
+ *
* Revision 3.62 2011/04/12 14:18:18 roebel
* Fixed Sdif[fF]GetPos and Sdif[fF]SetPos to correctly support large files (>2GB).
***************
*** 1365,1374 ****
int SdifFTruncate(SdifFileT *file)
{
#ifdef HAVE_FTRUNCATE
- off_t pos = ftello(file->Stream);
return (ftruncate(fileno(file->Stream), pos) == 0);
#else
# if defined(WIN32)
- __int64 pos = ftelli64(file->Stream);
return __chsize_s(_fileno(file->Stream), pos) == 0);
# else
--- 1368,1377 ----
int SdifFTruncate(SdifFileT *file)
{
+ SdiffPosT pos = 0;
+ SdiffGetPos(file->Stream, &pos);
#ifdef HAVE_FTRUNCATE
return (ftruncate(fileno(file->Stream), pos) == 0);
#else
# if defined(WIN32)
return __chsize_s(_fileno(file->Stream), pos) == 0);
# else
***************
*** 1384,1388 ****
[return] file offset or -1 for error.
SdiffPosT is a plattform dependent type that should correctly work with long files.
- Note, that the type may not be a integral type
*/
int SdifFGetPos(SdifFileT *file, SdiffPosT *pos)
--- 1387,1390 ----
***************
*** 1395,1404 ****
/* Set absolute position in file.
SdiffPosT is a plattform dependent type that should correctly work with long files.
- Note, that the type may not be a integral type
-
[Return] 0 on success,
-1 on error (errno is set, see fseek(3) for details)
! On Mac or Windows, seeking on a stream is always considered
successful (return 0), even if no seek was done!
*/
--- 1397,1404 ----
/* Set absolute position in file.
SdiffPosT is a plattform dependent type that should correctly work with long files.
[Return] 0 on success,
-1 on error (errno is set, see fseek(3) for details)
! On Windows, seeking on a stream is always considered
successful (return 0), even if no seek was done!
*/
|
|
From: Axel R. <ro...@us...> - 2011-04-12 14:20:19
|
Update of /cvsroot/sdif/SDIF/tools
In directory vz-cvs-3.sog:/tmp/cvs-serv5703/SDIF/tools
Modified Files:
querysdif.c
Log Message:
Removed unused variable, and fixed return code to be nonzero in case file is empty.
Index: querysdif.c
===================================================================
RCS file: /cvsroot/sdif/SDIF/tools/querysdif.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** querysdif.c 10 Aug 2009 16:24:24 -0000 1.16
--- querysdif.c 12 Apr 2011 14:20:17 -0000 1.17
***************
*** 15,18 ****
--- 15,21 ----
$Log$
+ Revision 1.17 2011/04/12 14:20:17 roebel
+ Removed unused variable, and fixed return code to be nonzero in case file is empty.
+
Revision 1.16 2009/08/10 16:24:24 diemo
- added flags to switch header, nvt, and type def printing
***************
*** 192,196 ****
#endif
{
- SdifFileT *in;
SdifQueryTreeT *sigs;
int nread, i, m;
--- 195,198 ----
***************
*** 321,324 ****
SdifGenKill ();
! return nread > 0;
}
--- 323,326 ----
SdifGenKill ();
! return nread == 0;
}
|
|
From: Axel R. <ro...@us...> - 2011-04-12 14:19:34
|
Update of /cvsroot/sdif/SDIF/test
In directory vz-cvs-3.sog:/tmp/cvs-serv5576/SDIF/test
Modified Files:
cmd_testcheck
Log Message:
Output error message in case querysdif program fails.
Index: cmd_testcheck
===================================================================
RCS file: /cvsroot/sdif/SDIF/test/cmd_testcheck,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cmd_testcheck 8 Dec 2006 18:13:39 -0000 1.5
--- cmd_testcheck 12 Apr 2011 14:19:32 -0000 1.6
***************
*** 33,36 ****
--- 33,37 ----
$QUERYPROG $FILE
if [ "$?" != "0" ] ; then
+ echo querysdif returns an error for $FILE.
exit 1;
fi
|