Jacques Lucke
e7ae9f493a
The crash was caused by allocating an uninitialized amount of memory. This fix initializes a bunch of variables that could cause the error. It should be possible to also fix this in the function that actually uses the uninitialized memory, but that could cause unknown consequences that are a bit too risky for 3.0. Just initializing some variables should be safe though. For more details see D13369. Differential Revision: https://developer.blender.org/D13369
112 lines
3.0 KiB
C++
112 lines
3.0 KiB
C++
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Copyright 2013, Blender Foundation.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <string.h>
|
|
|
|
#include "COM_PlaneDistortCommonOperation.h"
|
|
|
|
#include "DNA_movieclip_types.h"
|
|
#include "DNA_tracking_types.h"
|
|
|
|
#include "BLI_listbase.h"
|
|
#include "BLI_string.h"
|
|
|
|
namespace blender::compositor {
|
|
|
|
class PlaneTrackCommon {
|
|
protected:
|
|
MovieClip *movie_clip_;
|
|
int framenumber_;
|
|
char tracking_object_name_[64];
|
|
char plane_track_name_[64];
|
|
|
|
/* NOTE: this class is not an operation itself (to prevent virtual inheritance issues)
|
|
* implementation classes must make wrappers to use these methods, see below.
|
|
*/
|
|
void read_and_calculate_corners(PlaneDistortBaseOperation *distort_op);
|
|
void determine_canvas(const rcti &preferred_area, rcti &r_area);
|
|
|
|
public:
|
|
PlaneTrackCommon();
|
|
|
|
void set_movie_clip(MovieClip *clip)
|
|
{
|
|
movie_clip_ = clip;
|
|
}
|
|
void set_tracking_object(char *object)
|
|
{
|
|
BLI_strncpy(tracking_object_name_, object, sizeof(tracking_object_name_));
|
|
}
|
|
void set_plane_track_name(char *plane_track)
|
|
{
|
|
BLI_strncpy(plane_track_name_, plane_track, sizeof(plane_track_name_));
|
|
}
|
|
void set_framenumber(int framenumber)
|
|
{
|
|
framenumber_ = framenumber;
|
|
}
|
|
|
|
private:
|
|
void read_corners_from_track(float corners[4][2], float frame);
|
|
};
|
|
|
|
class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTrackCommon {
|
|
public:
|
|
PlaneTrackMaskOperation()
|
|
{
|
|
}
|
|
|
|
void init_data() override;
|
|
|
|
void init_execution() override;
|
|
|
|
void determine_canvas(const rcti &preferred_area, rcti &r_area) override
|
|
{
|
|
PlaneTrackCommon::determine_canvas(preferred_area, r_area);
|
|
|
|
rcti unused = COM_AREA_NONE;
|
|
rcti &preferred = r_area;
|
|
NodeOperation::determine_canvas(preferred, unused);
|
|
}
|
|
};
|
|
|
|
class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation,
|
|
public PlaneTrackCommon {
|
|
public:
|
|
PlaneTrackWarpImageOperation() : PlaneTrackCommon()
|
|
{
|
|
}
|
|
|
|
void init_data() override;
|
|
|
|
void init_execution() override;
|
|
|
|
void determine_canvas(const rcti &preferred_area, rcti &r_area) override
|
|
{
|
|
PlaneTrackCommon::determine_canvas(preferred_area, r_area);
|
|
|
|
rcti unused = COM_AREA_NONE;
|
|
rcti &preferred = r_area;
|
|
NodeOperation::determine_canvas(preferred, unused);
|
|
}
|
|
};
|
|
|
|
} // namespace blender::compositor
|