From 75d03de844518fd91b1adc76d7781b2b9606165d Mon Sep 17 00:00:00 2001
From: Philip Lamb <phil.git@eden.net.nz>
Date: Fri, 13 Mar 2020 20:00:01 +1300
Subject: [PATCH] png and tiff plugins do not depend on C++ exceptions.

---
 src/osgPlugins/CMakeLists.txt              | 4 ++--
 src/osgPlugins/rot/ReaderWriterROT.cpp     | 2 +-
 src/osgPlugins/trans/ReaderWriterTRANS.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
index 812550412..4982847ce 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -111,10 +111,10 @@ ENDIF()
 IF(GIFLIB_FOUND)
     ADD_PLUGIN_DIRECTORY(gif)
 ENDIF()
-IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+IF(PNG_FOUND)
     ADD_PLUGIN_DIRECTORY(png)
 ENDIF()
-IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+IF(TIFF_FOUND)
     ADD_PLUGIN_DIRECTORY(tiff)
 ENDIF()
 IF(GDAL_FOUND)
diff --git a/src/osgPlugins/rot/ReaderWriterROT.cpp b/src/osgPlugins/rot/ReaderWriterROT.cpp
index 6d2ea6e92..121a71d2f 100644
--- a/src/osgPlugins/rot/ReaderWriterROT.cpp
+++ b/src/osgPlugins/rot/ReaderWriterROT.cpp
@@ -80,7 +80,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
  * This pseudo-loader makes it simple to change the orientation of a saved
  * model by specifying a correcting rotation as part of the filename.
  *
- * Usage: <modelfile.ext>.<rx>,<ry>,<rz>.globe
+ * Usage: <modelfile.ext>.<rx>,<ry>,<rz>.rot
  * where:
  *    <modelfile.ext> = an model filename.
  *    <rx> = rotation around X axis [degrees]
diff --git a/src/osgPlugins/trans/ReaderWriterTRANS.cpp b/src/osgPlugins/trans/ReaderWriterTRANS.cpp
index 34e880b13..c20cae108 100644
--- a/src/osgPlugins/trans/ReaderWriterTRANS.cpp
+++ b/src/osgPlugins/trans/ReaderWriterTRANS.cpp
@@ -81,7 +81,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
  * This pseudo-loader make it simple to change the origin of a saved model
  * by specifying a correcting translation as part of the filename.
  *
- * Usage: <modelfile.ext>.<tx>,<ty>,<tz>.globe
+ * Usage: <modelfile.ext>.<tx>,<ty>,<tz>.trans
  * where:
  *      <modelfile.ext> = an model filename.
  *      <tx> = translation along the X axis.