Changeset 198 for trunk/src/formats/md3_loader.cc

Timestamp:

08/11/13 17:19:03 (12 years ago)

Author:

epyon

Message:

• warning cleanup for clang and gcc

File:

• trunk/src/formats/md3_loader.cc (modified) (8 diffs)

trunk/src/formats/md3_loader.cc

@@ -17 +17 @@
 
 // assuming low-endian
-#define MD3_MAGIC         "IDP3"
 #define MD3_MAX_FRAMES    1024
 #define MD3_MAX_TAGS      16
@@ -149 +148 @@
 static bool read_surface( md3_surface_t * surface, nv::stream& source )
 {
-        sint32 pos = source.tell();
+        sint32 pos = static_cast< sint32 >( source.tell() );
         source.read( &surface->header, sizeof(md3_surface_header_t), 1 );
 
@@ -164 +163 @@
 
         source.seek( pos + surface->header.ofs_shaders, origin::SET );
-        source.read( surface->shaders, sizeof( md3_shader_t ), surface->header.num_shaders );
+        source.read( surface->shaders, sizeof( md3_shader_t ), static_cast<size_t>( surface->header.num_shaders ) );
 
         source.seek( pos + surface->header.ofs_triangles, origin::SET );
-        source.read( surface->triangles, sizeof( md3_triangle_t ), surface->header.num_triangles );
+        source.read( surface->triangles, sizeof( md3_triangle_t ), static_cast<size_t>( surface->header.num_triangles ) );
 
         source.seek( pos + surface->header.ofs_st, origin::SET );
-        source.read( surface->st, sizeof( md3_texcoord_t ), surface->header.num_verts );
+        source.read( surface->st, sizeof( md3_texcoord_t ), static_cast<size_t>( surface->header.num_verts ) );
 
         source.seek( pos + surface->header.ofs_xyznormal, origin::SET );
-        source.read( surface->vertices, sizeof( md3_vertex_t ), surface->header.num_verts * surface->header.num_frames );
+        source.read( surface->vertices, sizeof( md3_vertex_t ), static_cast<size_t>( surface->header.num_verts * surface->header.num_frames ) );
 
         if ( source.tell() != static_cast<std::size_t>( pos + surface->header.ofs_end ) ) return false;
@@ -201 +200 @@
         md3->tags     = new md3_tag_t    [ md3->header.num_tags * md3->header.num_frames ];
         md3->surfaces = new md3_surface_t[ md3->header.num_surfaces ];
-        std::memset( md3->surfaces, 0, md3->header.num_surfaces * sizeof(md3_surface_t) );
+        std::memset( md3->surfaces, 0, static_cast< size_t >( md3->header.num_surfaces ) * sizeof(md3_surface_t) );
 
         source.seek( md3->header.ofs_frames, origin::SET );
-        source.read( md3->frames, sizeof( md3_frame_t ), md3->header.num_frames );
+        source.read( md3->frames, sizeof( md3_frame_t ), static_cast<size_t>( md3->header.num_frames ) );
 
         source.seek( md3->header.ofs_tags, origin::SET );
-        source.read( md3->tags, sizeof( md3_tag_t ), md3->header.num_tags * md3->header.num_frames );
+        source.read( md3->tags, sizeof( md3_tag_t ), static_cast<size_t>( md3->header.num_tags * md3->header.num_frames ) );
 
         source.seek( md3->header.ofs_surfaces, origin::SET );
@@ -351 +350 @@
 }
 
-sint32 md3_loader::get_max_frames() const
-{
-        return ((md3_t*)m_md3)->header.num_frames;
+size_t md3_loader::get_max_frames() const
+{
+        return static_cast< size_t >( ((md3_t*)m_md3)->header.num_frames );
 }
 
@@ -401 +400 @@
         sint32 frame_count   = ( frame == -1 ? md3->header.num_frames : 1 );
 
-        p.reserve( md3->vertices_per_frame * frame_count );
+        p.reserve( static_cast< size_t >( md3->vertices_per_frame * frame_count ) );
 
         while ( frame_count > 0 )
@@ -430 +429 @@
         sint32 frame_count   = ( frame == -1 ? md3->header.num_frames : 1 );
 
-        n.reserve( md3->vertices_per_frame * frame_count );
+        n.reserve( static_cast< size_t >( md3->vertices_per_frame * frame_count ) );
 
         while ( frame_count > 0 )
@@ -476 +475 @@
         {
                 const md3_surface_t& surface = md3->surfaces[i];
-                const sint32         tcount  = surface.header.num_triangles;
+                const size_t         tcount  = static_cast< size_t >( surface.header.num_triangles );
 
                 idx.reserve( idx.size() + tcount * 3 );
-                for (sint32 j = 0; j < tcount; ++j )
+                for (size_t j = 0; j < tcount; ++j )
                 {
                         const md3_triangle_t& t = surface.triangles[j];