Revision: 21082
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21082
Author: blendix
Date: 2009-06-22 20:19:18 +0200 (Mon, 22 Jun 2009)
Log Message:
-----------
2.5: warning fixes
Mostly harmless ones, except for one about "gzopen64" being
undeclared. This needs some defines in BLI_storage.h to be set
before <unistd.h> is included. Might fix a crash in compressed
file reading, though I'm not sure since it's hard to repeat
the crash consistently.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenlib/BLI_storage.h
branches/blender2.5/blender/source/blender/blenlib/intern/psfont.c
branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
branches/blender2.5/blender/source/blender/python/BPY_extern.h
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -3028,7 +3028,7 @@
if (VALID_CONS_TARGET(ct)) {
float loc[3], eul[3], size[3];
float dvec[3], sval[3];
- short i;
+ int i;
/* obtain target effect */
switch (data->from) {
@@ -3075,7 +3075,7 @@
switch (data->to) {
case 2: /* scaling */
for (i=0; i<3; i++)
- size[i]= data->to_min[i] +
(sval[data->map[i]] * (data->to_max[i] - data->to_min[i]));
+ size[i]= data->to_min[i] +
(sval[(int)data->map[i]] * (data->to_max[i] - data->to_min[i]));
break;
case 1: /* rotation */
for (i=0; i<3; i++) {
@@ -3085,7 +3085,7 @@
tmax= data->to_max[i];
/* all values here should be in degrees
*/
- eul[i]= tmin + (sval[data->map[i]] *
(tmax - tmin));
+ eul[i]= tmin + (sval[(int)data->map[i]]
* (tmax - tmin));
/* now convert final value back to
radians */
eul[i] = (float)(eul[i] / 180 * M_PI);
@@ -3094,7 +3094,7 @@
default: /* location */
/* get new location */
for (i=0; i<3; i++)
- loc[i]= (data->to_min[i] +
(sval[data->map[i]] * (data->to_max[i] - data->to_min[i])));
+ loc[i]= (data->to_min[i] +
(sval[(int)data->map[i]] * (data->to_max[i] - data->to_min[i])));
/* add original location back on (so that it
can still be moved) */
VecAddf(loc, cob->matrix[3], loc);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -29,6 +29,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
#include <math.h>
#include <stdlib.h>
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -29,6 +29,7 @@
*
* ***** END GPL LICENSE BLOCK *****/
+#include "BLI_storage.h"
#include <ctype.h> /* isdigit, isspace */
#include <math.h>
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -28,6 +28,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
#include "MEM_guardedalloc.h"
#include "DNA_mesh_types.h"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -230,16 +230,16 @@
*/
newsize = (newsize >> 3) + (newsize < 9 ? 3 : 6) + newsize;
- newarr = MEM_callocN(idp_size_table[prop->subtype]*newsize, "idproperty
array resized");
+ newarr = MEM_callocN(idp_size_table[(int)prop->subtype]*newsize,
"idproperty array resized");
if (newlen >= prop->len) {
/* newlen is bigger*/
- memcpy(newarr, prop->data.pointer,
prop->len*idp_size_table[prop->subtype]);
+ memcpy(newarr, prop->data.pointer,
prop->len*idp_size_table[(int)prop->subtype]);
idp_resize_group_array(prop, newlen, newarr);
}
else {
/* newlen is smaller*/
idp_resize_group_array(prop, newlen, newarr);
- memcpy(newarr, prop->data.pointer,
newlen*prop->len*idp_size_table[prop->subtype]);
+ memcpy(newarr, prop->data.pointer,
newlen*prop->len*idp_size_table[(int)prop->subtype]);
}
MEM_freeN(prop->data.pointer);
@@ -546,7 +546,7 @@
return BSTR_EQ(IDP_String(prop1), IDP_String(prop2));
else if(prop1->type == IDP_ARRAY) {
if(prop1->len == prop2->len && prop1->subtype == prop2->subtype)
- return memcmp(IDP_Array(prop1), IDP_Array(prop2),
idp_size_table[prop1->subtype]*prop1->len);
+ return memcmp(IDP_Array(prop1), IDP_Array(prop2),
idp_size_table[(int)prop1->subtype]*prop1->len);
else
return 0;
}
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
---
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2009-06-22 17:20:35 UTC (rev 21081)
+++
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -29,6 +29,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
#include <stdlib.h>
#include <math.h>
#include <string.h>
@@ -2203,12 +2205,15 @@
*sfra = MAX2(1, (int)part->sta);
*efra = MIN2((int)(part->end + part->lifetime + 1.0), scene->r.efra);
}
-static float *particle_state_ptr(int index, ParticleSystem *psys)
+static float *particle_state_ptr(int index, void *psys_ptr)
{
+ ParticleSystem *psys= psys_ptr;
+
return (float *)(&(psys->particles+index)->state);
}
-static void particle_read_state(int index, ParticleSystem *psys, float *data)
+static void particle_read_state(int index, void *psys_ptr, float *data)
{
+ ParticleSystem *psys= psys_ptr;
ParticleData *pa = psys->particles + index;
ParticleKey *key = (ParticleKey *)data;
@@ -2217,8 +2222,9 @@
copy_particle_key(&pa->state, key, 1);
}
-static void particle_cache_interpolate(int index, ParticleSystem *psys, float
frs_sec, float cfra, int cfra1, int cfra2, float *data1, float *data2)
+static void particle_cache_interpolate(int index, void *psys_ptr, float
frs_sec, float cfra, int cfra1, int cfra2, float *data1, float *data2)
{
+ ParticleSystem *psys= psys_ptr;
ParticleData *pa = psys->particles + index;
ParticleKey keys[4];
float dfra;
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -1050,7 +1050,6 @@
int endframe = CFRA;
int bake = baker->bake;
int render = baker->render;
- int end = 0;
G.afbreek = 0;
@@ -1162,7 +1161,6 @@
int totelem=0;
int float_count=0;
int tot;
- int write_error=0;
if (!G.relbase_valid){
cache->flag &= ~PTCACHE_DISK_CACHE;
@@ -1243,4 +1241,4 @@
BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
cache->flag &= ~PTCACHE_DISK_CACHE;
}
-}
\ No newline at end of file
+}
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_storage.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_storage.h
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_storage.h
2009-06-22 18:19:18 UTC (rev 21082)
@@ -25,15 +25,20 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+
#ifndef BLI_STORAGE_H
#define BLI_STORAGE_H
+/* NOTE: these have to be defined before including unistd.h! */
#ifndef __APPLE__
#ifndef WIN32
-#define _LARGEFILE_SOURCE 1
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64
#endif
#endif
+#endif
struct direntry;
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/psfont.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/psfont.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/psfont.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -837,7 +837,7 @@
while(newfgets(oneline, LINELEN, pf)) {
hptr = (char *)oneline;
while(*hptr) {
- if(hextab[*hptr] != NOTHEX)
+ if(hextab[(int)*hptr] != NOTHEX)
hexdat[hexbytes++] = *hptr;
hptr++;
}
@@ -853,7 +853,7 @@
bptr = bindat;
c = datbytes;
while(c--) {
- *bptr++ = (hextab[hptr[0]]<<4)+hextab[hptr[1]];
+ *bptr++ =
(hextab[(int)hptr[0]]<<4)+hextab[(int)hptr[1]];
hptr += 2;
}
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
---
branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
2009-06-22 17:20:35 UTC (rev 21081)
+++
branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -32,6 +32,8 @@
#include <config.h>
#endif
+#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
Modified:
branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
2009-06-22 17:20:35 UTC (rev 21081)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_header.c
2009-06-22 18:19:18 UTC (rev 21082)
@@ -88,6 +88,7 @@
/* ************************ header area region *********************** */
#ifndef DISABLE_PYTHON
+#if 0
static void do_text_template_scriptsmenu(bContext *C, void *arg, int event)
{
// XXX BPY_menu_do_python(PYMENU_SCRIPTTEMPLATE, event);
@@ -154,6 +155,7 @@
return block;
}
#endif
+#endif
/************************** properties ******************************/
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
