From 9ca784cf9563ef4a443b6cf808c935334be91e88 Mon Sep 17 00:00:00 2001
From: Wim Meeussen <wim@willowgarage.com>
Date: Tue, 21 Jun 2011 16:32:36 -0700
Subject: [PATCH] move collada check into urdf model

---
 collada_parser/src/collada_parser.cpp | 25 -------------------------
 urdf/src/model.cpp                    |  5 ++++-
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/collada_parser/src/collada_parser.cpp b/collada_parser/src/collada_parser.cpp
index d221de5..398dad3 100644
--- a/collada_parser/src/collada_parser.cpp
+++ b/collada_parser/src/collada_parser.cpp
@@ -2518,31 +2518,6 @@ namespace urdf{
 
   };
 
-  bool urdfFromColladaFile(std::string const& daefilename, boost::shared_ptr<ModelInterface> model)
-  {
-    ColladaModelReader reader(model);
-    return reader.InitFromFile(daefilename);
-  }
-
-  bool urdfFromColladaData(std::string const& data, boost::shared_ptr<ModelInterface> model)
-  {
-    ColladaModelReader reader(model);
-    return reader.InitFromData(data);
-  }
-
-  bool IsColladaFile(const std::string& filename)
-  {
-    size_t len = filename.size();
-    if( len < 4 )
-      return false;
-    return filename[len-4] == '.' && ::tolower(filename[len-3]) == 'd' && ::tolower(filename[len-2]) == 'a' && ::tolower(filename[len-1]) == 'e';
-  }
-
-  bool IsColladaData(const std::string& data)
-  {
-    return data.find("<COLLADA") != std::string::npos;
-  }
-
 
 
 
diff --git a/urdf/src/model.cpp b/urdf/src/model.cpp
index ac4dd36..adf4ece 100644
--- a/urdf/src/model.cpp
+++ b/urdf/src/model.cpp
@@ -43,7 +43,10 @@
 
 namespace urdf{
 
-bool IsColladaData(const std::string& data);
+bool IsColladaData(const std::string& data)
+{
+  return data.find("<COLLADA") != std::string::npos;
+}
 
 
 bool Model::initFile(const std::string& filename)