Clang-Tidy: More fixed of redundant check before delete

For some reason got unnoticed in the original cleanup pass.
This commit is contained in:
Sergey Sharybin 2020-07-03 16:44:46 +02:00
parent 14fd91e7e8
commit 9739fc4d1b
6 changed files with 13 additions and 39 deletions

View File

@ -53,9 +53,7 @@ void NormalizeOperation::executePixel(float output[4], int x, int y, void *data)
void NormalizeOperation::deinitExecution()
{
this->m_imageReader = NULL;
if (this->m_cachedInstance) {
delete this->m_cachedInstance;
}
delete this->m_cachedInstance;
NodeOperation::deinitMutex();
}

View File

@ -85,9 +85,7 @@ void PhotoreceptorTonemapOperation::executePixel(float output[4], int x, int y,
void TonemapOperation::deinitExecution()
{
this->m_imageReader = NULL;
if (this->m_cachedInstance) {
delete this->m_cachedInstance;
}
delete this->m_cachedInstance;
NodeOperation::deinitMutex();
}

View File

@ -98,9 +98,7 @@ void ComponentNode::init(const ID * /*id*/, const char * /*subdata*/)
ComponentNode::~ComponentNode()
{
clear_operations();
if (operations_map != nullptr) {
delete operations_map;
}
delete operations_map;
}
string ComponentNode::identifier() const

View File

@ -117,12 +117,8 @@ struct IK_Target {
}
~IK_Target()
{
if (constraint) {
delete constraint;
}
if (target) {
delete target;
}
delete constraint;
delete target;
}
};
@ -196,29 +192,17 @@ struct IK_Scene {
~IK_Scene()
{
// delete scene first
if (scene) {
delete scene;
}
delete scene;
for (std::vector<IK_Target *>::iterator it = targets.begin(); it != targets.end(); ++it) {
delete (*it);
}
targets.clear();
if (channels) {
delete[] channels;
}
if (solver) {
delete solver;
}
if (armature) {
delete armature;
}
if (base) {
delete base;
}
delete[] channels;
delete solver;
delete armature;
delete base;
// delete cache last
if (cache) {
delete cache;
}
delete cache;
}
};

View File

@ -51,9 +51,7 @@ void Image::allocate(uint w, uint h)
void Image::free()
{
if (m_data) {
delete[] m_data;
}
delete[] m_data;
m_data = NULL;
}

View File

@ -528,9 +528,7 @@ BoneExtensionManager::~BoneExtensionManager()
for (BoneExtensionMap::iterator ext_it = extended_bones->begin();
ext_it != extended_bones->end();
++ext_it) {
if (ext_it->second != NULL) {
delete ext_it->second;
}
delete ext_it->second;
}
extended_bones->clear();
delete extended_bones;