Commit 0295dfbf authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'ft_warning'

37df0bd2 Better assert for test
941be8d8 Try to shut up warning
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !647
parents cbd0bd13 37df0bd2
......@@ -639,11 +639,11 @@ void vtkFreeTypeTools::MapTextPropertyToId(vtkTextProperty *tprop,
{
angle += 3600;
}
// We really should not use more than 12 bits
assert(angle >= 0 && (angle & 0xfffff000) == 0);
angle <<= bits;
// We really should not use more than 32 bits
vtkIdType merged = (bold | italic | angle);
assert(merged <= std::numeric_limits<vtkTypeUInt32>::max());
// Now final id
*id |= merged;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment