Changeset 406 for trunk/nv/interface/interpolation_raw.hh

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/nv/interface/interpolation_raw.hh (modified) (3 diffs)

trunk/nv/interface/interpolation_raw.hh

@@ -29 +29 @@
         inline uint32 interpolate_raw_quat( float factor, const float* k1, const float* k2, float* result )
         {
-                *((quat*)(result)) = interpolate( *((quat*)(k1)), *((quat*)(k2)), factor );
+                *( reinterpret_cast<quat*>(result) ) = interpolate( *( reinterpret_cast<const quat*>(k1) ), *( reinterpret_cast<const quat*>(k2) ), factor );
                 return 4;
         }
@@ -53 +53 @@
         {
                 quat result;
-                memcpy((float*)(&result), data, sizeof(quat));
+                memcpy(reinterpret_cast<float*>(&result), data, sizeof(quat));
                 return result;
         }
@@ -139 +139 @@
         inline void transform_key_position( uint8* data, float scale, const mat3& r33 )
         {
-                vec3& p = *((vec3*)(data));
+                vec3& p = *( reinterpret_cast<vec3*>( data ) );
                 p = r33 * p * scale;
         }
         inline void transform_key_rotation( uint8* data, const mat3& r33, const mat3& ri33 )
         {
-                quat& r = *((quat*)(data));
+                quat& r = *( reinterpret_cast<quat*>( data ) );
                 r = quat_cast( r33 * mat3_cast( r ) * ri33 );
         }
         inline void transform_key_scale( void* data, float scale )
         {
-                vec3& s = *((vec3*)(data));
+                vec3& s = *( reinterpret_cast<vec3*>( data ) );
                 s = s * scale;
         }
         inline void transform_key_transform( uint8* data, float scale, const mat3& r33, const mat3& ri33 )
         {
-                transform& t = *((transform*)(data));
+                transform& t = *( reinterpret_cast<transform*>( data ) );
                 t = transform( 
                         r33 * t.get_position() * scale,