Renamed remaining PotraceUtil to PotraceTool.

ossimlabs · Jun 16, 2017 · ef6a974 · ef6a974
1 parent e58d6fa
commit ef6a974
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/potrace/src/ossimPotracePluginInit.cpp b/potrace/src/ossimPotracePluginInit.cpp
@@ -18,7 +18,7 @@ extern "C"
 
    const char* getDescription()
    {
-      return "Potrace utility plugin\n\n";
+      return "Potrace Tool plugin\n\n";
    }
 
    int getNumberOfClassNames()
@@ -30,7 +30,7 @@ extern "C"
    {
       if (idx == 0)
       {
-         return "ossimPotraceUtil";
+         return "ossimPotraceTool";
       }
       return (const char*)0;
    }

diff --git a/potrace/src/ossimPotraceTool.cpp b/potrace/src/ossimPotraceTool.cpp
@@ -127,7 +127,7 @@ void ossimPotraceTool::initialize(const ossimKeywordlist& kwl)
       m_mode = LINESTRING;
    else if (!value.empty())
    {
-      xmsg <<"ossimPotraceUtil:"<<__LINE__<<" Unallowed mode requested: <"<<value<<">."
+      xmsg <<"ossimPotraceTool:"<<__LINE__<<" Unallowed mode requested: <"<<value<<">."
             <<endl;
       throw ossimException(xmsg.str());
    }
@@ -151,7 +151,7 @@ bool ossimPotraceTool::execute()
 
    if (m_imgLayers.empty() || !m_geom.valid())
    {
-      xmsg<<"ossimPotraceUtil:"<<__LINE__<<" Null input image list encountered! ";
+      xmsg<<"ossimPotraceTool:"<<__LINE__<<" Null input image list encountered! ";
       throw ossimException(xmsg.str());
    }
 
@@ -173,7 +173,7 @@ bool ossimPotraceTool::execute()
    potrace_state_t* potraceOutput = potrace_trace(potraceParam, m_productBitmap);
    if (!potraceOutput)
    {
-      xmsg <<"ossimPotraceUtil:"<<__LINE__<<" Null pointer returned from potrace_trace!";
+      xmsg <<"ossimPotraceTool:"<<__LINE__<<" Null pointer returned from potrace_trace!";
       throw ossimException(xmsg.str());
    }
 
@@ -497,7 +497,7 @@ bool ossimPotraceTool::writeGeoJSON(potrace_path_t* vectorList)
    FILE* outFile = fopen(m_productFilename.chars(), "w");
    if (!outFile)
    {
-      xmsg <<"ossimPotraceUtil:"<<__LINE__<<" Could not open output file <"<<m_productFilename
+      xmsg <<"ossimPotraceTool:"<<__LINE__<<" Could not open output file <"<<m_productFilename
             <<"> for writing.";
       throw ossimException(xmsg.str());
    }
@@ -510,7 +510,7 @@ bool ossimPotraceTool::writeGeoJSON(potrace_path_t* vectorList)
       ifstream vectorFile (m_productFilename.chars());
       if (vectorFile.fail())
       {
-         xmsg <<"ossimPotraceUtil:"<<__LINE__<<" Error encountered opening temporary vector file at: "
+         xmsg <<"ossimPotraceTool:"<<__LINE__<<" Error encountered opening temporary vector file at: "
                "<"<<m_productFilename<<">.";
          throw ossimException(xmsg.str());
       }

diff --git a/potrace/src/ossimPotraceToolFactory.cpp b/potrace/src/ossimPotraceToolFactory.cpp
@@ -34,7 +34,7 @@ ossimTool* ossimPotraceToolFactory::createTool(const std::string& argName) const
    ossimString utilName (argName);
    utilName.downcase();
 
-   if ((utilName == "potrace") || (argName == "ossimPotraceUtil"))
+   if ((utilName == "potrace") || (argName == "ossimPotraceTool"))
       return new ossimPotraceTool;
 
    return 0;
@@ -54,5 +54,5 @@ std::map<std::string, std::string> ossimPotraceToolFactory::getCapabilities() co
 
 void ossimPotraceToolFactory::getTypeNameList(vector<ossimString>& typeList) const
 {
-   typeList.push_back("ossimPotraceUtil");
+   typeList.push_back("ossimPotraceTool");
 }
diff --git a/potrace/src/ossimPotraceToolFactory.h b/potrace/src/ossimPotraceToolFactory.h
@@ -5,8 +5,8 @@
 //
 //**************************************************************************************************
 
-#ifndef ossimPotraceUtilFactory_HEADER
-#define ossimPotraceUtilFactory_HEADER 1
+#ifndef ossimPotraceToolFactory_HEADER
+#define ossimPotraceToolFactory_HEADER 1
 
 #include <ossim/plugin/ossimPluginConstants.h>
 #include <ossim/util/ossimToolFactoryBase.h>
@@ -37,4 +37,4 @@ class OSSIM_PLUGINS_DLL ossimPotraceToolFactory: public ossimToolFactoryBase
 
 };
 
-#endif /* end of #ifndef ossimPotraceUtilFactory_HEADER */
+#endif /* end of #ifndef ossimPotraceToolFactory_HEADER */