[MOAB-dev] r5453 - in MOAB/tags/4.5.0: . itaps/imesh

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-03-28 09:31:58 -0500 (Wed, 28 Mar 2012)
New Revision: 5453

Modified:
   MOAB/tags/4.5.0/
   MOAB/tags/4.5.0/itaps/imesh/iMesh_MOAB.cpp
Log:
Back-porting fix for identical allocated/occupied size arguments.




Property changes on: MOAB/tags/4.5.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /MOAB/branches/Version4.0:4323-4497
/MOAB/branches/jk-direct-tag:4069-4327
   + /MOAB/branches/Version4.0:4323-4497
/MOAB/branches/jk-direct-tag:4069-4327
/MOAB/trunk:5452

Modified: MOAB/tags/4.5.0/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/tags/4.5.0/itaps/imesh/iMesh_MOAB.cpp	2012-03-26 21:55:26 UTC (rev 5452)
+++ MOAB/tags/4.5.0/itaps/imesh/iMesh_MOAB.cpp	2012-03-28 14:31:58 UTC (rev 5453)
@@ -1957,7 +1957,7 @@
                      tag_values_allocated,
                      tag_values_size, err);
     *tag_values_allocated /= sizeof(int);
-    *tag_values_size /= sizeof(int);
+    if (tag_values_size != tag_values_allocated) *tag_values_size /= sizeof(int);
   }
 
   void iMesh_getDblArrData (iMesh_Instance instance,
@@ -1976,7 +1976,7 @@
                      tag_values,
                      tag_values_allocated, tag_values_size, err);
     *tag_values_allocated /= sizeof(double);
-    *tag_values_size /= sizeof(double);
+    if (tag_values_size != tag_values_allocated) *tag_values_size /= sizeof(double);
   }
 
   void iMesh_getEHArrData (iMesh_Instance instance,
@@ -1996,7 +1996,7 @@
                      tag_value_allocated,
                      tag_value_size, err);
     *tag_value_allocated /= sizeof(iBase_EntityHandle);
-    *tag_value_size /= sizeof(iBase_EntityHandle);
+    if (tag_value_size != tag_value_allocated) *tag_value_size /= sizeof(iBase_EntityHandle);
   }
 
   void iMesh_getESHArrData (iMesh_Instance instance,
@@ -2016,7 +2016,7 @@
                      tag_value_allocated,
                      tag_value_size, err);
     *tag_value_allocated /= sizeof(iBase_EntityHandle);
-    *tag_value_size /= sizeof(iBase_EntityHandle);
+    if (tag_value_size != tag_value_allocated) *tag_value_size /= sizeof(iBase_EntityHandle);
   }
 
   void iMesh_setArrData (iMesh_Instance instance,