Commit 07fe423c authored by myron's avatar myron

Merge branch 'roustine2'

parents 228c5157 297d6cc8
......@@ -436,11 +436,7 @@ void CCreading_infos_PrereadHeaders(CCreading_infos* self, int tryconstheader,
sizeofdatatype[UnsignedShort]=2;
sizeofdatatype[SignedInteger]=4;
self->Dim_1 = 0;
self->Dim_2 = 0;
self->datatype = UnsignedShort;
if(file_list==self->proj_file_list) {
sizeImag_ptr = &(self->sizeImage);
byteorder_ptr = &(self->byteorder);
......
......@@ -775,6 +775,12 @@ Cspace_new( PyObject *self, PyObject *args)
res->myCCspace->reading_infos.numpjs_span = cpyutils_o2i(cpyutils_getattribute(res->OParameters ,"numpjs_span"));
res->myCCspace->reading_infos.Dim_1 = 0;
res->myCCspace->reading_infos.Dim_2 = 0;
res->myCCspace->reading_infos.datatype = 0;
if(res->myCCspace->params.do_custom_angles==1) {
assert( PyArray_DIMS((PyArrayObject *)res->Oangles)[0] == res->myCCspace->reading_infos.numpjs );
}
......
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