Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.0
scilab
scilab-hdf5-1_10-compat.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File scilab-hdf5-1_10-compat.patch of Package scilab
Index: scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c =================================================================== --- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c +++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c @@ -742,7 +742,11 @@ int readCommonPolyMatrix(int _iDatasetId /* * Open the referenced object, get its name and type. */ - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); + obj = H5Rdereference(_iDatasetId, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + H5R_OBJECT, &pData[i]); if (_iComplex) { status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); @@ -976,7 +980,11 @@ int readCommonSparseComplexMatrix(int _i } //read Row data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix(obj, _piNbItemRow); if (status < 0) { @@ -984,7 +992,11 @@ int readCommonSparseComplexMatrix(int _i } //read cols data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[1]); status = readInteger32Matrix(obj, _piColPos); if (status < 0) { @@ -992,7 +1004,11 @@ int readCommonSparseComplexMatrix(int _i } //read sparse data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[2]); if (_iComplex) { @@ -1043,7 +1059,11 @@ int readBooleanSparseMatrix(int _iDatase } //read Row data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix(obj, _piNbItemRow); if (status < 0) { @@ -1053,7 +1073,11 @@ int readBooleanSparseMatrix(int _iDatase if (_iNbItem != 0) { //read cols data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); + obj = H5Rdereference(_iDatasetId, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + H5R_OBJECT, &pRef[1]); status = readInteger32Matrix(obj, _piColPos); if (status < 0) { @@ -1154,7 +1178,11 @@ int getListItemDataset(int _iDatasetId, { hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); + *_piItemDataset = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &poRef); if (*_piItemDataset == 0) { Index: scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c =================================================================== --- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c +++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c @@ -474,7 +474,11 @@ int readDoubleMatrix_v1(int _iDatasetId, } //Open the referenced object, get its name and type. - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref); + obj = H5Rdereference(_iDatasetId, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + H5R_OBJECT, &Ref); readDouble_v1(obj, _iRows, _iCols, _pdblData); } @@ -501,14 +505,22 @@ int readDoubleComplexMatrix_v1(int _iDat } //Open the referenced object, get its name and type. - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readDouble_v1(obj, _iRows, _iCols, _pdblReal); if (status < 0) { return -1; } - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[1]); status = readDouble_v1(obj, _iRows, _iCols, _pdblImg); if (status < 0) { @@ -834,7 +846,11 @@ int readCommonPolyMatrix_v1(int _iDatase /* * Open the referenced object, get its name and type. */ - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); + obj = H5Rdereference(_iDatasetId, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + H5R_OBJECT, &pData[i]); if (_iComplex) { status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); @@ -1069,7 +1085,11 @@ int readCommonSparseComplexMatrix_v1(int } //read Row data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); if (status < 0) { @@ -1077,7 +1097,11 @@ int readCommonSparseComplexMatrix_v1(int } //read cols data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[1]); status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); if (status < 0) { @@ -1085,7 +1109,11 @@ int readCommonSparseComplexMatrix_v1(int } //read sparse data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[2]); if (_iComplex) { @@ -1131,7 +1159,11 @@ int readBooleanSparseMatrix_v1(int _iDat } //read Row data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow); if (status < 0) { @@ -1139,7 +1171,11 @@ int readBooleanSparseMatrix_v1(int _iDat } //read cols data - obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); + obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[1]); status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos); if (status < 0) { @@ -1234,7 +1270,11 @@ int getListItemDataset_v1(int _iDatasetI { hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos]; - *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef); + *_piItemDataset = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &poRef); if (*_piItemDataset == 0) { Index: scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp =================================================================== --- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp +++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp @@ -42,7 +42,11 @@ const char ** H5ReferenceData::getRefere for (int i = 0; i < totalSize; i++) { void * ref = &(((void **)cdata)[i]); - hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + hid_t obj = H5Rdereference(file, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); H5O_info_t info; H5Oget_info(obj, &info); H5Oclose(obj); @@ -84,7 +88,11 @@ H5Object & H5ReferenceData::getData(cons file = getFile().getH5Id(); ref = &(((void **)cdata)[0]); - obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + obj = H5Rdereference(file, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); if (obj < 0) { throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position.")); @@ -126,7 +134,11 @@ H5Object ** H5ReferenceData::getReferenc for (int i = 0; i < totalSize; i++) { void * ref = &(((void **)cdata)[i]); - hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + hid_t obj = H5Rdereference(file, + #if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, + #endif + datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); objs[i] = &H5Object::getObject(getParent(), obj); } @@ -181,7 +193,11 @@ void H5ReferenceData::printData(std::ost char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize); void ** ref = &(((void **)cdata)[0]); hid_t file = getFile().getH5Id(); - hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); + hid_t obj = H5Rdereference(file, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref); if (obj < 0) { os << "NULL"; Index: scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp =================================================================== --- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp +++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp @@ -648,7 +648,11 @@ static types::InternalType* import_struc //import field for (int j = 0; j < refcount; ++j) { - int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); + int data = H5Rdereference(refs, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &vrefs[j]); if (data < 0) { freeStringMatrix(dfield, fields.data()); Index: scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp =================================================================== --- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp +++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp @@ -735,7 +735,11 @@ static bool read_struct(int dataset, Var //import field for (int j = 0; j < refcount; ++j) { - int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]); + int data = H5Rdereference(refs, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &vrefs[j]); if (data < 0) { return false;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
