Fix warnings reported by cavity checker
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Aug 2013 07:32:47 +0000 (07:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Aug 2013 07:32:47 +0000 (07:32 +0000)
source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
source/blender/editors/mask/mask_relationships.c

index fe794cb769f865ef1300229cb4652ef1e3fb4698..8aa1324d8e2803dae5ddbef126f21b4ac9302ddc 100644 (file)
@@ -38,15 +38,16 @@ extern "C" {
 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)
index c90e915fcd5c585b6710e0750f05536216bb4027..2385219c65663d54d1fc9797bbe3a36f799bea93 100644 (file)
@@ -106,6 +106,9 @@ PlaneTrackWarpImageOperation::PlaneTrackWarpImageOperation() : PlaneTrackCommonO
        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 @@ void PlaneTrackWarpImageOperation::initExecution()
 
        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()
index 6ced2423074c0f51b44d9092c7ad03fbffbb2af4..9cc1702addbcc4b98da1a26d5398eb856d0ec135 100644 (file)
@@ -137,6 +137,7 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
 
                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);