Fix some compile warnings.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 11:54:03 +0000 (11:54 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 19 May 2011 11:54:03 +0000 (11:54 +0000)
source/blender/blenkernel/intern/world.c
source/blender/imbuf/intern/png.c
source/blender/modifiers/intern/MOD_subsurf.c

index 8cecad979021377ed8f826cb9e3051e5161b4fbe..d413177873f3e6f3d8b549dbc177e2d68b1532e3 100644 (file)
@@ -43,6 +43,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
+#include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_world.h"
index 6b6dcdb88afd4b729504e5c010270c7a17120b82..f0c06ec0ae760f918fadc5d741c49ee7f430e89c 100644 (file)
@@ -391,7 +391,7 @@ struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
 
                if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
                        int unit_type;
-                       unsigned int xres, yres;
+                       png_uint_32 xres, yres;
 
                        if(png_get_pHYs(png_ptr, info_ptr, &xres, &yres, &unit_type))
                        if(unit_type == PNG_RESOLUTION_METER) {
index e3e09f660aaa26bf14b9ac5e964a7ca4262d20cc..f780721ca07206b0eed1af9485e9cce0506aa8f4 100644 (file)
@@ -111,7 +111,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
        return result;
 }
 
-static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
+static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob),
                                                struct EditMesh *UNUSED(editData),
                                                DerivedMesh *derivedData)
 {