Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9965)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 10088)
@@ -168,5 +168,7 @@
             // Find out the frame pts
 
-            if (packet.packet.dts == AV_NOPTS_VALUE && m_frame->opaque != 0 && *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
+            if (packet.packet.dts == AV_NOPTS_VALUE &&
+                m_frame->opaque != 0 &&
+                *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
             {
                 pts = *reinterpret_cast<const int64_t*>(m_frame->opaque);
Index: /OpenSceneGraph/trunk/src/osgPlugins/3ds/readwrite.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/3ds/readwrite.cpp (revision 10076)
+++ /OpenSceneGraph/trunk/src/osgPlugins/3ds/readwrite.cpp (revision 10088)
@@ -374,5 +374,5 @@
 {
   ASSERT(strm);
-  strm->write((char*)b,1);
+  strm->write((const char*)b,1);
   if (strm->fail()) {
     return(LIB3DS_FALSE);
@@ -401,5 +401,5 @@
   b[0]=(Lib3dsByte)((Lib3dsWord)w & 0x00FF);
 
-  strm->write((char*)b,2);
+  strm->write((const char*)b,2);
   if (strm->fail()) {
     return(LIB3DS_FALSE);
@@ -430,5 +430,5 @@
   b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF));
 
-  strm->write((char*)b,4);
+  strm->write((const char*)b,4);
   if (strm->fail()) {
     return(LIB3DS_FALSE);
Index: /OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp (revision 10040)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ply/plyfile.cpp (revision 10088)
@@ -47,5 +47,7 @@
 #include <string.h>
 
-
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    #pragma warning( disable : 4996 )
+#endif
 
 #ifdef WIN32
@@ -2412,22 +2414,22 @@
           break;
       case PLY_DOUBLE:
-          result = fread (ptr, 8, 1, plyfile->fp);
-          if(!result < 1)
-          {
-              throw ply::MeshException( "Error in reading PLY file."
-                                 "fread not succeeded." );
-          }
-          if( plyfile->file_type == PLY_BINARY_BE )
-          {
-              swap8BE(ptr);
-          }
-          else
-          {
-              swap8LE(ptr);
-          }
-      *double_val = *((double *) ptr);
-      *int_val = (int) *double_val;
-      *uint_val = (unsigned int) *double_val;
-      break;
+        result = fread (ptr, 8, 1, plyfile->fp);
+        if(result < 1)
+        {
+            throw ply::MeshException( "Error in reading PLY file."
+                                "fread not succeeded." );
+        }
+        if( plyfile->file_type == PLY_BINARY_BE )
+        {
+            swap8BE(ptr);
+        }
+        else
+        {
+            swap8LE(ptr);
+        }
+        *double_val = *((double *) ptr);
+        *int_val = (int) *double_val;
+        *uint_val = (unsigned int) *double_val;
+        break;
     default:
       char error[100];
Index: /OpenSceneGraph/trunk/src/osgPlugins/ply/vertexData.h
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ply/vertexData.h (revision 10012)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ply/vertexData.h (revision 10088)
@@ -27,5 +27,5 @@
 
 // defined elsewhere
-class PlyFile;
+struct PlyFile;
 
 namespace ply