Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton
2015-04-19 22:03:42 +10:00
parent e5048dd4ca
commit 6f0f1dc3be
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extern/libmv/intern/stub.cc vendored
View File

@@ -179,20 +179,20 @@ void libmv_reconstructionDestroy(
/* ************ Feature detector ************ */
libmv_Features *libmv_detectFeaturesByte(const unsigned char */*image_buffer*/,
libmv_Features *libmv_detectFeaturesByte(const unsigned char * /*image_buffer*/,
int /*width*/,
int /*height*/,
int /*channels*/,
libmv_DetectOptions */*options*/) {
libmv_DetectOptions * /*options*/) {
return NULL;
}
struct libmv_Features *libmv_detectFeaturesFloat(
const float */*image_buffer*/,
const float * /*image_buffer*/,
int /*width*/,
int /*height*/,
int /*channels*/,
libmv_DetectOptions */*options*/) {
libmv_DetectOptions * /*options*/) {
return NULL;
}
@@ -247,7 +247,7 @@ void libmv_cameraIntrinsicsSetThreads(
}
void libmv_cameraIntrinsicsExtractOptions(
const libmv_CameraIntrinsics */*libmv_intrinsics*/,
const libmv_CameraIntrinsics * /*libmv_intrinsics*/,
libmv_CameraIntrinsicsOptions *camera_intrinsics_options) {
memset(camera_intrinsics_options, 0, sizeof(libmv_CameraIntrinsicsOptions));
camera_intrinsics_options->focal_length = 1.0;
@@ -355,7 +355,7 @@ void libmv_autoTrackSetOptions(libmv_AutoTrack* /*libmv_autotrack*/,
int libmv_autoTrackMarker(libmv_AutoTrack* /*libmv_autotrack*/,
const libmv_TrackRegionOptions* /*libmv_options*/,
libmv_Marker */*libmv_tracker_marker*/,
libmv_Marker * /*libmv_tracker_marker*/,
libmv_TrackRegionResult* /*libmv_result*/)
{
return 0;
@@ -390,7 +390,7 @@ void libmv_FrameAccessorDestroy(libmv_FrameAccessor* /*frame_accessor*/)
}
int64_t libmv_frameAccessorgetTransformKey(
const libmv_FrameTransform */*transform*/)
const libmv_FrameTransform * /*transform*/)
{
return 0;
}

3
source/blender/blenkernel/intern/camera.c
View File

@@ -728,7 +728,8 @@ static void camera_stereo3d_model_matrix(Object *camera, const bool is_left, flo
if (((pivot == CAM_S3D_PIVOT_LEFT) && is_left) ||
((pivot == CAM_S3D_PIVOT_RIGHT) && !is_left))
{
return camera_model_matrix(camera, r_modelmat);
camera_model_matrix(camera, r_modelmat);
return;
}
else {
float size[3];

4
source/blender/blenkernel/intern/customdata.c
View File

@@ -2294,7 +2294,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest,
}
}
if (count > SOURCE_BUF_SIZE) MEM_freeN(sources);
if (count > SOURCE_BUF_SIZE) MEM_freeN((void *)sources);
}
void CustomData_swap(struct CustomData *data, int index, const int *corner_indices)
@@ -3852,7 +3852,7 @@ void CustomData_data_transfer(const MeshPairRemap *me_remap, const CustomDataTra
if (tmp_data_src) {
if (UNLIKELY(sources_num > tmp_buff_size)) {
tmp_buff_size = (size_t)sources_num;
tmp_data_src = MEM_reallocN(tmp_data_src, sizeof(*tmp_data_src) * tmp_buff_size);
tmp_data_src = MEM_reallocN((void *)tmp_data_src, sizeof(*tmp_data_src) * tmp_buff_size);
}
for (j = 0; j < sources_num; j++) {

8
source/blender/blenkernel/intern/image.c
View File

@@ -960,8 +960,10 @@ void BKE_image_memorypack(Image *ima)
{
ImBuf *ibuf;
if ((ima->flag & IMA_IS_MULTIVIEW))
return image_memorypack_multiview(ima);
if ((ima->flag & IMA_IS_MULTIVIEW)) {
image_memorypack_multiview(ima);
return;
}
ibuf = image_get_cached_ibuf_for_index_frame(ima, IMA_NO_INDEX, 0);
@@ -2494,7 +2496,7 @@ static void image_init_imageuser(Image *ima, ImageUser *iuser)
void BKE_image_init_imageuser(Image *ima, ImageUser *iuser)
{
return image_init_imageuser(ima, iuser);
image_init_imageuser(ima, iuser);
}
void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)