X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMedReader%2FIO%2FvtkMedUtilities.cxx;h=898d0460cd55da4147cc8df48f2b245244724a9e;hb=c7c9039d845fb2a5e2eb391139af089b4bed26a5;hp=10a29238bf0e78f60524f11024ea7321e84d50c4;hpb=1f06dfe3d17b83750bef2a7b5d45760ab57bf68b;p=modules%2Fparavis.git diff --git a/src/Plugins/MedReader/IO/vtkMedUtilities.cxx b/src/Plugins/MedReader/IO/vtkMedUtilities.cxx index 10a29238..898d0460 100644 --- a/src/Plugins/MedReader/IO/vtkMedUtilities.cxx +++ b/src/Plugins/MedReader/IO/vtkMedUtilities.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2012 CEA/DEN, EDF R&D +// Copyright (C) 2010-2013 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -213,8 +213,6 @@ const char* vtkMedUtilities::GeometryName(med_geometry_type geometry) return "MED_POLYGON"; case MED_POLYHEDRON: return "MED_POLYHEDRON"; - case MED_STRUCT_GEO_INTERNAL: - return "MED_STRUCT_GEO_INTERNAL"; case MED_NO_GEOTYPE: return "MED_NO_GEOTYPE"; default: @@ -631,7 +629,7 @@ int vtkMedUtilities::FormatPolyhedronForVTK( if (array->GetConnectivity()==MED_NODAL) { - ids->InsertNextId(end-start); + ids->InsertNextId(end-start-1); for (int ff = start; ffGetValue(ff)-1; @@ -686,21 +684,21 @@ int vtkMedUtilities::FormatPolyhedronForVTK( return 1; } -void vtkMedUtilities::SplitGroupKey(const char* name, vtkstd::string& mesh, - vtkstd::string& entity, vtkstd::string& group) +void vtkMedUtilities::SplitGroupKey(const char* name, std::string& mesh, + std::string& entity, std::string& group) { - vtkstd::string remain; + std::string remain; remain=name; mesh="*"; entity="*"; group="*"; - vtkstd::string header="*"; + std::string header="*"; if(remain=="*") { return; } - vtkstd::string::size_type pos; + std::string::size_type pos; // First get the header, which must be "GROUP" pos=remain.find_first_of(vtkMedUtilities::Separator); header=remain.substr(0, pos);