Commit 35293955 authored by vigmond's avatar vigmond

Doxygen source dir updated. Weird gzclose() error on my machine.

parent 75b1965a
......@@ -25,3 +25,4 @@ TimeLink.h
trimesh.cc
trimesh.h
.DS_Store
doc/
This diff is collapsed.
......@@ -85,16 +85,16 @@ class DataReader
* Initialize anything that you may need later such as opening
* file (to be determined by the programmer)
*/
DataReader():mthread(0),sthread(0),maxmin_ptr(0),data(0),in(NULL){}
DataReader(){}
DataReader(Master<T>*m, Slave<T>*s, Maxmin<T>* mnmx):
mthread(m),sthread(s),maxmin_ptr(mnmx),data(0),in(NULL){}
mthread(m),sthread(s),maxmin_ptr(mnmx){}
protected:
Master<T>* mthread;
Slave<T>* sthread;
Maxmin<T>* maxmin_ptr;
T* data;
gzFile in;
Master<T>* mthread = NULL;
Slave<T>* sthread = NULL;
Maxmin<T>* maxmin_ptr = NULL;
T* data = NULL;
gzFile in = NULL;
};
#endif
......
......@@ -25,7 +25,7 @@ class IGBreader : public DataReader<T>
using DataReader<T>:: maxmin_ptr;
using DataReader<T>:: data;
using DataReader<T>:: in;
char* buf;
char* buf = NULL;
int slsz; //!< size of slice in bytes
IGBheader* head;
};
......@@ -34,7 +34,6 @@ template<class T>
IGBreader<T>::IGBreader( Master<T>* _mthread, Slave<T>* _sthread,
Maxmin<T>* _maxmin_ptr )
{
buf = 0;
mthread = _mthread;
sthread = _sthread;
maxmin_ptr = _maxmin_ptr;
......@@ -57,10 +56,9 @@ IGBreader<T>::IGBreader( Master<T>* _mthread, Slave<T>* _sthread,
template<class T>
IGBreader<T>::~IGBreader()
{
gzclose( in );
//gzclose( in );
delete head;
delete [] buf;
if( buf ) delete [] buf;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment