Commit: d508b69e44bb3c5911d7716048c28fe0dc5e609b
Author: Campbell Barton
Date: Tue May 16 12:46:52 2017 +1000
Branches: master
https://developer.blender.org/rBd508b69e44bb3c5911d7716048c28fe0dc5e609b
Cleanup: gcc7.1 warnings
===================================================================
M source/blender/blenlib/intern/array_store.c
M source/blender/editors/transform/transform_input.c
===================================================================
diff --git a/source/blender/blenlib/intern/array_store.c
b/source/blender/blenlib/intern/array_store.c
index 295b39c1a2f..5d1b2433084 100644
--- a/source/blender/blenlib/intern/array_store.c
+++ b/source/blender/blenlib/intern/array_store.c
@@ -878,7 +878,7 @@ static hash_key key_from_chunk_ref(
{
/* in C, will fill in a reusable array */
BChunk *chunk = cref->link;
- BLI_assert(info->accum_read_ahead_bytes * info->chunk_stride);
+ BLI_assert((info->accum_read_ahead_bytes * info->chunk_stride) != 0);
if (info->accum_read_ahead_bytes <= chunk->data_len) {
hash_key key;
diff --git a/source/blender/editors/transform/transform_input.c
b/source/blender/editors/transform/transform_input.c
index 42cc918ec8c..22c39d6ed0c 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -187,7 +187,7 @@ static void InputAngle(TransInfo *UNUSED(t), MouseInput
*mi, const double mval[2
/* use doubles here, to make sure a "1.0" (no rotation) doesn't become
9.999999e-01, which gives 0.02 for acos */
double deler = (((dx1 * dx1 + dy1 * dy1) +
(dx2 * dx2 + dy2 * dy2) -
- (dx3 * dx3 + dy3 * dy3)) / (2.0 * ((A * B) ? (A * B) :
1.0)));
+ (dx3 * dx3 + dy3 * dy3)) / (2.0 * (((A * B) != 0.0) ?
(A * B) : 1.0)));
/* ((A * B) ? (A * B) : 1.0) this takes care of potential divide by
zero errors */
float dphi;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
