X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHDFPersist%2FHDFdatasetGetType.c;h=d64cce3a6156951d906d2ab21c25fd48fc2c116c;hb=a931021f3c1a39bf7a41a70e3fadc3df7343609b;hp=9cc4bbd6a8c53e571777813d7fac9b86631bc19a;hpb=102608ce8b69dd1ea798169e30223b67742ec26d;p=modules%2Fkernel.git diff --git a/src/HDFPersist/HDFdatasetGetType.c b/src/HDFPersist/HDFdatasetGetType.c index 9cc4bbd6a..d64cce3a6 100644 --- a/src/HDFPersist/HDFdatasetGetType.c +++ b/src/HDFPersist/HDFdatasetGetType.c @@ -1,29 +1,29 @@ +// Copyright (C) 2007-2011 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 : HDFdatasetGetType.c -Module : SALOME + Module : SALOME ----------------------------------------------------------------------------*/ #include "hdfi.h" @@ -34,21 +34,19 @@ HDFdatasetGetType(hdf_idt id) { hdf_idt type_id; hdf_type type; - hdf_class_type hdf_type; hdf_size_type size; if ((type_id = H5Dget_type(id)) < 0) return HDF_NONE; - hdf_type = H5Tget_class(type_id); - switch (hdf_type) + switch (H5Tget_class(type_id)) { case H5T_INTEGER : size = H5Tget_size(type_id); if (size == 4) - type = HDF_INT32; + type = HDF_INT32; else - type = HDF_INT64; + type = HDF_INT64; break; case H5T_FLOAT : @@ -58,6 +56,10 @@ HDFdatasetGetType(hdf_idt id) case H5T_STRING : type = HDF_STRING; break; + + case H5T_ARRAY : + type = HDF_ARRAY; + break; default : type = HDF_NONE;