[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59257] trunk/blender/source/blender: Fix warnings reported by cavity checker

[Sergey Sharybin]

Revision: 59257
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59257
Author:   nazgul
Date:     2013-08-19 07:32:47 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Fix warnings reported by cavity checker

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    trunk/blender/source/blender/editors/mask/mask_relationships.c

Modified: trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp	2013-08-19 04:23:54 UTC (rev 59256)
+++ trunk/blender/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp	2013-08-19 07:32:47 UTC (rev 59257)
@@ -38,15 +38,16 @@
 PlaneTrackMaskOperation::PlaneTrackMaskOperation() : PlaneTrackCommonOperation()
 {
 	this->addOutputSocket(COM_DT_VALUE);
+
+	/* Currently hardcoded to 8 samples. */
+	this->m_osa = 8;
 }
 
 void PlaneTrackMaskOperation::initExecution()
 {
 	PlaneTrackCommonOperation::initExecution();
 
-	const int osa = 8;
-	this->m_osa = osa;
-	BLI_jitter_init(this->m_jitter[0], osa);
+	BLI_jitter_init(this->m_jitter[0], this->m_osa);
 }
 
 void PlaneTrackMaskOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)

Modified: trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp	2013-08-19 04:23:54 UTC (rev 59256)
+++ trunk/blender/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp	2013-08-19 07:32:47 UTC (rev 59257)
@@ -106,6 +106,9 @@
 	this->addOutputSocket(COM_DT_COLOR);
 	this->m_pixelReader = NULL;
 	this->setComplex(true);
+
+	/* Currently hardcoded to 8 samples. */
+	this->m_osa = 8;
 }
 
 void PlaneTrackWarpImageOperation::initExecution()
@@ -114,9 +117,7 @@
 
 	this->m_pixelReader = this->getInputSocketReader(0);
 
-	const int osa = 8;
-	this->m_osa = osa;
-	BLI_jitter_init(this->m_jitter[0], osa);
+	BLI_jitter_init(this->m_jitter[0], this->m_osa);
 }
 
 void PlaneTrackWarpImageOperation::deinitExecution()

Modified: trunk/blender/source/blender/editors/mask/mask_relationships.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_relationships.c	2013-08-19 04:23:54 UTC (rev 59256)
+++ trunk/blender/source/blender/editors/mask/mask_relationships.c	2013-08-19 07:32:47 UTC (rev 59257)
@@ -137,6 +137,7 @@
 
 		sub_parent_name = track->name;
 		parent_type = MASK_PARENT_POINT_TRACK;
+		memset(orig_corners, 0, sizeof(orig_corners));
 	}
 	else if ((plane_track = BKE_tracking_plane_track_get_active(tracking)) != NULL) {
 		MovieTrackingPlaneMarker *plane_marker = BKE_tracking_plane_marker_get(plane_track, framenr);