X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHDFPersist%2FHDFdatasetWrite.c;h=5a3e87185ece7fb4b95643b6a951f31ffd3754db;hb=54c311c4540ce9169bcb2d291f27d222162a04f0;hp=07dbefdd9dd64d1e0e5ac3e3503fcb31859cba90;hpb=9483a95cb84e57058d023f45a235e77fc0422234;p=modules%2Fkernel.git

diff --git a/src/HDFPersist/HDFdatasetWrite.c b/src/HDFPersist/HDFdatasetWrite.c
index 07dbefdd9..5a3e87185 100644
--- a/src/HDFPersist/HDFdatasetWrite.c
+++ b/src/HDFPersist/HDFdatasetWrite.c
@@ -1,32 +1,33 @@
+// Copyright (C) 2007-2012  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   : HDFdatasetWrite.c
-Module : SALOME
+  Module : SALOME
 ----------------------------------------------------------------------------*/
 
 #include "hdfi.h"
+#include <stdlib.h>
 
 /*
  * - Name : _MEDdatasetWrite
@@ -42,21 +43,32 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
 {
   hdf_idt datatype;
   hdf_err ret;
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   int isI32BE = 0;
-  int size;
+  int size = 0;
 #endif
 
   if ((datatype = H5Dget_type(id)) < 0)
     return -1;
 
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   if((H5Tget_class(datatype) == H5T_INTEGER) && (H5Tget_size(datatype) == 4)) {
     isI32BE = 1; /* See HDFdatasetCreate */
-    size = (int)HDFdatasetGetSize(id) / 4;
+
+    /*SRN : bug IPAL9619:  replaced the method of getting the size of INT32 dataset */ 
+    int i, ndim = HDFdatasetGetnDim(id);
+    if(ndim < 0) return -1;
+    
+    hdf_size *dim = (hdf_size *) malloc(sizeof(hdf_size)*ndim);
+    if ((ret = HDFdatasetGetDim(id, dim)) < 0)  return -1;
+        
+    for(i=0; i<ndim; i++) size+=dim[i];    
+    free(dim);
+    /*SRN : end of the fix */
+    
     if(size == 0) 
       return -1;
-    if(H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32BE, size, (void *)val, NULL, NULL) < 0) 
+    if(H5Tconvert(H5T_NATIVE_INT, H5T_STD_I32BE, size, (void *)val, NULL, (hid_t)0) < 0) 
       return -1;
   }
 #endif
@@ -64,8 +76,8 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
   if ((ret = H5Dwrite(id, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, val)) < 0) 
     return -1;
 
-#ifdef PCLINUX
-  if (isI32BE && (H5Tconvert(H5T_STD_I32BE, H5T_NATIVE_INT, size, (void *)val, NULL, NULL) < 0)) 
+#if defined (PCLINUX) || defined (PCLINUX64)
+  if (isI32BE && (H5Tconvert(H5T_STD_I32BE, H5T_NATIVE_INT, size, (void *)val, NULL, (hid_t)0) < 0)) 
     return -1;
 #endif