Revision: 51311
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51311
Author: campbellbarton
Date: 2012-10-14 07:40:16 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
code cleanup: remove redundant casts. quiet some qualifier warnings.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/source/blender/blenlib/intern/math_base_inline.c
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
trunk/blender/source/blender/compositor/intern/COM_Node.cpp
trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.cpp
trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
trunk/blender/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
trunk/blender/source/blender/editors/mask/mask_select.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/tracking_select.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -89,7 +89,7 @@
#else
/* We only have one X11 setting at the moment. */
GHOST_ASSERT(display < 1, "Only single display systems are currently
supported.\n");
- numSettings = GHOST_TInt32(1);
+ numSettings = 1;
#endif
return GHOST_kSuccess;
@@ -160,7 +160,7 @@
/* According to the xf86vidmodegetallmodelines man page,
* "The first element of the array corresponds to the current video
mode."
*/
- return getDisplaySetting(display, GHOST_TInt32(0), setting);
+ return getDisplaySetting(display, 0, setting);
}
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-10-14
06:59:01 UTC (rev 51310)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-10-14
07:40:16 UTC (rev 51311)
@@ -1456,7 +1456,7 @@
/* check size and format of the property */
XGetWindowProperty(m_display, win, m_xclip_out, 0, 0,
False,
AnyPropertyType, &pty_type,
&pty_format,
- &pty_items, &pty_size, (unsigned
char **) &buffer);
+ &pty_items, &pty_size, &buffer);
if (pty_format != 8) {
/* property does not contain text, delete it
@@ -1484,7 +1484,7 @@
* text, we know the size. */
XGetWindowProperty(m_display, win, m_xclip_out, 0,
(long) pty_size,
False, AnyPropertyType, &pty_type,
&pty_format,
- &pty_items, &pty_size, (unsigned
char **) &buffer);
+ &pty_items, &pty_size, &buffer);
/* allocate memory to accommodate data in *txt */
if (*len == 0) {
@@ -1538,12 +1538,12 @@
if (sseln == m_clipboard) {
sel_buf = (unsigned char
*)malloc(strlen(txt_cut_buffer) + 1);
strcpy((char *)sel_buf, txt_cut_buffer);
- return((GHOST_TUns8 *)sel_buf);
+ return sel_buf;
}
else {
sel_buf = (unsigned char
*)malloc(strlen(txt_select_buffer) + 1);
strcpy((char *)sel_buf, txt_select_buffer);
- return((GHOST_TUns8 *)sel_buf);
+ return sel_buf;
}
}
else if (owner == None)
@@ -1594,7 +1594,7 @@
else
free(sel_buf);
- return (GHOST_TUns8 *)tmp_data;
+ return tmp_data;
}
return(NULL);
}
Modified: trunk/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base_inline.c
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/blenlib/intern/math_base_inline.c
2012-10-14 07:40:16 UTC (rev 51311)
@@ -59,34 +59,34 @@
{
if (fac <= -1.0f) return (float)M_PI;
else if (fac >= 1.0f) return 0.0;
- else return (float)acos(fac);
+ else return acosf(fac);
}
MINLINE float saasin(float fac)
{
if (fac <= -1.0f) return (float)-M_PI / 2.0f;
else if (fac >= 1.0f) return (float)M_PI / 2.0f;
- else return (float)asin(fac);
+ else return asinf(fac);
}
MINLINE float sasqrt(float fac)
{
if (fac <= 0.0f) return 0.0f;
- return (float)sqrt(fac);
+ return sqrtf(fac);
}
MINLINE float saacosf(float fac)
{
if (fac <= -1.0f) return (float)M_PI;
else if (fac >= 1.0f) return 0.0f;
- else return (float)acosf(fac);
+ else return acosf(fac);
}
MINLINE float saasinf(float fac)
{
if (fac <= -1.0f) return (float)-M_PI / 2.0f;
else if (fac >= 1.0f) return (float)M_PI / 2.0f;
- else return (float)asinf(fac);
+ else return asinf(fac);
}
MINLINE float sasqrtf(float fac)
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -50,7 +50,7 @@
this->m_context.setbNodeTree(editingtree);
this->m_context.setFastCalculation(fastcalculation);
bNode *gnode;
- for (gnode = (bNode *)editingtree->nodes.first; gnode; gnode = (bNode
*)gnode->next) {
+ for (gnode = (bNode *)editingtree->nodes.first; gnode; gnode =
gnode->next) {
if (gnode->type == NODE_GROUP &&
gnode->typeinfo->group_edit_get(gnode)) {
this->m_context.setActivegNode(gnode);
break;
Modified:
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
---
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -51,7 +51,7 @@
while (node != NULL) {
Node *nnode = addNode(nodes, node, isActiveGroup,
system.getContext().isFastCalculation());
nnode->setbNodeGroup(groupnode);
- node = (bNode *)node->next;
+ node = node->next;
}
NodeRange node_range(nodes.begin() + nodes_start, nodes.end());
@@ -60,7 +60,7 @@
bNodeLink *nodelink = (bNodeLink *)tree->links.first;
while (nodelink != NULL) {
addNodeLink(node_range, links, nodelink);
- nodelink = (bNodeLink *)nodelink->next;
+ nodelink = nodelink->next;
}
/* Expand group nodes */
Modified: trunk/blender/source/blender/compositor/intern/COM_Node.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Node.cpp 2012-10-14
06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/compositor/intern/COM_Node.cpp 2012-10-14
07:40:16 UTC (rev 51311)
@@ -51,7 +51,7 @@
if (input->type == SOCK_VECTOR) dt = COM_DT_VECTOR;
this->addInputSocket(dt,
(InputSocketResizeMode)input->resizemode, input);
- input = (bNodeSocket *)input->next;
+ input = input->next;
}
bNodeSocket *output = (bNodeSocket *)editorNode->outputs.first;
while (output != NULL) {
@@ -60,14 +60,14 @@
if (output->type == SOCK_VECTOR) dt = COM_DT_VECTOR;
this->addOutputSocket(dt, output);
- output = (bNodeSocket *)output->next;
+ output = output->next;
}
}
}
void Node::addSetValueOperation(ExecutionSystem *graph, InputSocket
*inputsocket, int editorNodeInputSocketIndex)
{
- bNodeSocket *bSock = (bNodeSocket
*)this->getEditorInputSocket(editorNodeInputSocketIndex);
+ bNodeSocket *bSock =
this->getEditorInputSocket(editorNodeInputSocketIndex);
SetValueOperation *operation = new SetValueOperation();
bNodeSocketValueFloat *val = (bNodeSocketValueFloat
*)bSock->default_value;
operation->setValue(val->value);
@@ -114,7 +114,7 @@
void Node::addSetColorOperation(ExecutionSystem *graph, InputSocket
*inputsocket, int editorNodeInputSocketIndex)
{
- bNodeSocket *bSock = (bNodeSocket
*)this->getEditorInputSocket(editorNodeInputSocketIndex);
+ bNodeSocket *bSock =
this->getEditorInputSocket(editorNodeInputSocketIndex);
SetColorOperation *operation = new SetColorOperation();
bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA
*)bSock->default_value;
operation->setChannel1(val->value[0]);
@@ -127,7 +127,7 @@
void Node::addSetVectorOperation(ExecutionSystem *graph, InputSocket
*inputsocket, int editorNodeInputSocketIndex)
{
- bNodeSocket *bSock = (bNodeSocket
*)this->getEditorInputSocket(editorNodeInputSocketIndex);
+ bNodeSocket *bSock =
this->getEditorInputSocket(editorNodeInputSocketIndex);
bNodeSocketValueVector *val = (bNodeSocketValueVector
*)bSock->default_value;
SetVectorOperation *operation = new SetVectorOperation();
operation->setX(val->value[0]);
Modified: trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -74,7 +74,7 @@
{
cl_int error;
- MemoryBuffer *result = (MemoryBuffer
*)reader->getInputMemoryBuffer(inputMemoryBuffers);
+ MemoryBuffer *result = reader->getInputMemoryBuffer(inputMemoryBuffers);
const cl_image_format imageFormat = {
CL_RGBA,
Modified: trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -79,7 +79,7 @@
CompositorQuality quality = context->getQuality();
/* initialize node data */
- NodeBlurData *data = (NodeBlurData *)&this->m_alpha_blur;
+ NodeBlurData *data = &this->m_alpha_blur;
memset(data, 0, sizeof(*data));
data->filtertype = R_FILTER_GAUSS;
Modified: trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++ trunk/blender/source/blender/compositor/nodes/COM_KeyingNode.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -151,7 +151,7 @@
CompositorQuality quality = context->getQuality();
/* initialize node data */
- NodeBlurData *data = (NodeBlurData *)&this->m_alpha_blur;
+ NodeBlurData *data = &this->m_alpha_blur;
memset(data, 0, sizeof(*data));
data->filtertype = R_FILTER_GAUSS;
Modified:
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
2012-10-14 06:59:01 UTC (rev 51310)
+++
trunk/blender/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
2012-10-14 07:40:16 UTC (rev 51311)
@@ -64,8 +64,8 @@
this->m_inverseFocalDistance = 1.0f / focalDistance;
this->m_aspect = (this->getWidth() > this->getHeight()) ?
(this->getHeight() / (float)this->getWidth()) : (this->getWidth() /
(float)this->getHeight());
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
