Changeset 10763 for OpenSceneGraph/trunk/src/osgPlugins/png/ReaderWriterPNG.cpp

Timestamp:

11/17/09 13:55:52 (4 years ago)

Author:

robert

Message:

Added OSG_CPP_EXCEPTIONS_AVAILABLE cmake option to enable optional build of plugins and examples that required C++ exceptions

Files:

• OpenSceneGraph/trunk/src/osgPlugins/png/ReaderWriterPNG.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/png/ReaderWriterPNG.cpp

@@ -52 +52 @@
 void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
 {
+#ifdef OSG_CPP_EXCEPTIONS_AVAILABLE
     throw PNGError(error_msg);
+#else
+    osg::notify(osg::WARN) << "PNG lib warning : " << error_msg << std::endl;
+#endif
 }
 
@@ -167 +171 @@
             png_set_error_fn(png, png_get_error_ptr(png), user_error_fn, user_warning_fn);
 
+            #ifdef OSG_CPP_EXCEPTIONS_AVAILABLE
             try
+            #endif
             {
-
                 info = png_create_info_struct(png);
                 endinfo = png_create_info_struct(png);
@@ -301 +306 @@
 
                 return pOsgImage;
-            }
+
+            }
+            #ifdef OSG_CPP_EXCEPTIONS_AVAILABLE
             catch (PNGError& err)
             {
@@ -308 +315 @@
                 return ReadResult::ERROR_IN_READING_FILE;
             }
+            #endif
         }