kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

use const and array size in function definitions, no functional change.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-17 08:14:43 +00:00
parent ec4181701f
commit f3e182231d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/BLI_voxel.h
View File

@ -36,9 +36,9 @@
#define V_I(x, y, z, res) ( (z)*(res)[1]*(res)[0] + (y)*(res)[0] + (x) )
/* all input coordinates must be in bounding box 0.0 - 1.0 */
float voxel_sample_nearest(float *data, int *res, float *co);
float voxel_sample_trilinear(float *data, int *res, float *co);
float voxel_sample_triquadratic(float *data, int *res, float *co);
float voxel_sample_tricubic(float *data, int *res, float *co, int bspline);
float voxel_sample_nearest(float *data, const int res[3], const float co[3]);
float voxel_sample_trilinear(float *data, const int res[3], const float co[3]);
float voxel_sample_triquadratic(float *data, const int res[3], const float co[3]);
float voxel_sample_tricubic(float *data, const int res[3], const float co[3], int bspline);
#endif /* BLI_VOXEL_H */

10
source/blender/blenlib/intern/voxel.c
View File

@ -36,7 +36,7 @@
BM_INLINE float D(float *data, int *res, int x, int y, int z)
BM_INLINE float D(float *data, const int res[3], int x, int y, int z)
{
CLAMP(x, 0, res[0]-1);
CLAMP(y, 0, res[1]-1);
@ -46,7 +46,7 @@ BM_INLINE float D(float *data, int *res, int x, int y, int z)
/* *** nearest neighbour *** */
/* input coordinates must be in bounding box 0.0 - 1.0 */
float voxel_sample_nearest(float *data, int *res, float *co)
float voxel_sample_nearest(float *data, const int res[3], const float co[3])
{
int xi, yi, zi;
@ -71,7 +71,7 @@ BM_INLINE int _clamp(int a, int b, int c)
return (a < b) ? b : ((a > c) ? c : a);
}
float voxel_sample_trilinear(float *data, int *res, float *co)
float voxel_sample_trilinear(float *data, const int res[3], const float co[3])
{
if (data) {
@ -103,7 +103,7 @@ float voxel_sample_trilinear(float *data, int *res, float *co)
}
float voxel_sample_triquadratic(float *data, int *res, float *co)
float voxel_sample_triquadratic(float *data, const int res[3], const float co[3])
{
if (data) {
@ -133,7 +133,7 @@ float voxel_sample_triquadratic(float *data, int *res, float *co)
return 0.f;
}
float voxel_sample_tricubic(float *data, int *res, float *co, int bspline)
float voxel_sample_tricubic(float *data, const int res[3], const float co[3], int bspline)
{
if (data) {

2
source/blender/render/intern/include/voxeldata.h
View File

@ -45,6 +45,6 @@ typedef struct VoxelDataHeader
void make_voxeldata(struct Render *re);
void free_voxeldata(struct Render *re);
int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres);
int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texres);
#endif /* VOXELDATA_H */

2
source/blender/render/intern/source/voxeldata.c
View File

@ -383,7 +383,7 @@ void make_voxeldata(struct Render *re)
}
int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres)
int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texres)
{
int retval = TEX_INT;
VoxelData *vd = tex->vd;