X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHDFPersist%2FHDFdatasetCreate.c;h=515f4c84d52dd8dba82d3ddd7c6288c9fb47e4c3;hb=097a334e0c1f59c0fae9536d14b6a823fc2b2137;hp=095c400c47d7ffd4e3ab43efedda90e4503a0ada;hpb=a66b03a69e4472ccdffa9ce5531072c84727d6ce;p=modules%2Fkernel.git diff --git a/src/HDFPersist/HDFdatasetCreate.c b/src/HDFPersist/HDFdatasetCreate.c index 095c400c4..515f4c84d 100644 --- a/src/HDFPersist/HDFdatasetCreate.c +++ b/src/HDFPersist/HDFdatasetCreate.c @@ -1,29 +1,29 @@ +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library 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.1 of the License. +// +// This library 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 along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + /*---------------------------------------------------------------------------- SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) - - Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, - CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS - - This library 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.1 of the License. - - This library 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 along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org - - - File : HDFdatasetCreate.c -Module : SALOME + Module : SALOME ----------------------------------------------------------------------------*/ #include "hdfi.h" @@ -43,7 +43,7 @@ Module : SALOME */ hdf_idt HDFdatasetCreate(hdf_idt pid,char *name,hdf_type type, - hdf_size *dimd, int ndim, hdf_byte_order order) + hdf_size *dimd, int ndim, hdf_byte_order order, hdf_idt arrayId) { hdf_idt dataset, dataspace = 0; hdf_err ret; @@ -52,7 +52,7 @@ hdf_idt HDFdatasetCreate(hdf_idt pid,char *name,hdf_type type, switch(type) { case HDF_FLOAT64 : -#ifdef PCLINUX +#if defined (PCLINUX) || defined (PCLINUX64) type_hdf = H5T_IEEE_F64BE; #else type_hdf = H5T_IEEE_F64LE; @@ -60,7 +60,7 @@ hdf_idt HDFdatasetCreate(hdf_idt pid,char *name,hdf_type type, break; case HDF_INT32 : -#ifdef PCLINUX +#if defined (PCLINUX) || defined (PCLINUX64) type_hdf = H5T_STD_I32BE; #else type_hdf = H5T_NATIVE_INT; @@ -73,11 +73,15 @@ hdf_idt HDFdatasetCreate(hdf_idt pid,char *name,hdf_type type, case HDF_STRING : if((new_type_hdf = H5Tcopy(H5T_C_S1)) < 0) - return -1; + return -1; if((ret = H5Tset_size(new_type_hdf,1)) < 0) - return -1; - break; + return -1; + break; + case HDF_ARRAY : + type_hdf = arrayId; + break; + default : return -1; } @@ -95,12 +99,12 @@ hdf_idt HDFdatasetCreate(hdf_idt pid,char *name,hdf_type type, if ((dataset = H5Dopen(pid,name)) < 0) { - if ((dataspace = H5Screate_simple(ndim, dimd, NULL)) < 0) - return -1; + if ((dataspace = H5Screate_simple(ndim, dimd, NULL)) < 0) + return -1; if ((dataset = H5Dcreate(pid,name, new_type_hdf < 0 ? type_hdf : new_type_hdf, dataspace, H5P_DEFAULT)) < 0) - return -1; + return -1; } else return -1;