Random buildings - initial commit.

[simgear.git] / simgear / scene / material / mipmap.cxx

diff --git a/simgear/scene/material/mipmap.cxx b/simgear/scene/material/mipmap.cxx
index a64784b4993da94d02b148a3d66c206efea787ff..59a800daaee2334531dea116e0459673f1b87972 100644 (file)
--- a/simgear/scene/material/mipmap.cxx
+++ b/simgear/scene/material/mipmap.cxx
@@ -44,7 +44,7 @@ EffectNameValue<MipMapFunction> mipmapFunctionsInit[] =
 EffectPropertyMap<MipMapFunction> mipmapFunctions(mipmapFunctionsInit);
 
 MipMapTuple makeMipMapTuple(Effect* effect, const SGPropertyNode* props,
-                      const SGReaderWriterXMLOptions* options)
+                      const SGReaderWriterOptions* options)
 {
     const SGPropertyNode* pMipmapR
         = getEffectPropertyChild(effect, props, "function-r");
@@ -209,6 +209,7 @@ osg::Vec4::value_type computeComponent( int c, osg::Vec4 colors[2][2][2], bool c
     case PRODUCT: return computeProduct( c, colors, colorValid );
     case MIN: return computeMin( c, colors, colorValid );
     case MAX: return computeMax( c, colors, colorValid );
+    default: break;
     }
     return 0;
 }
@@ -230,7 +231,7 @@ osg::Vec4 computeColor( osg::Vec4 colors[2][2][2], bool colorValid[2][2][2], Mip
 void dumpMipmap( std::string n, int s, int t, int r, int c, unsigned char *d, const osg::Image::MipmapDataType &o )
 {
     std::ofstream ofs( (n + ".dump").c_str() );
-    for ( int i = 0; i < o.size()+1; ++i )
+    for ( osg::Image::MipmapDataType::size_type i = 0; i < o.size()+1; ++i )
     {
         ofs << s << " " << t << " " << r << std::endl;
         unsigned int offset = 0;