From b7dfe661b5578eee3426628763aceb91628ee973 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 3 Jul 2023 14:42:07 +0900 Subject: [PATCH] common: --unnecessary null check. --- src/lib/sw_engine/tvgSwRenderer.cpp | 2 +- src/lib/tvgFill.h | 2 +- src/lib/tvgPaint.cpp | 2 +- src/lib/tvgPaint.h | 4 ++-- src/lib/tvgPictureImpl.h | 2 +- src/lib/tvgRender.h | 6 +++--- src/lib/tvgSaver.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/sw_engine/tvgSwRenderer.cpp b/src/lib/sw_engine/tvgSwRenderer.cpp index 336c57b4..43c6c319 100644 --- a/src/lib/sw_engine/tvgSwRenderer.cpp +++ b/src/lib/sw_engine/tvgSwRenderer.cpp @@ -355,7 +355,7 @@ SwRenderer::~SwRenderer() { clearCompositors(); - if (surface) delete(surface); + delete(surface); if (!sharedMpool) mpoolTerm(mpool); diff --git a/src/lib/tvgFill.h b/src/lib/tvgFill.h index c8fdadce..20603b73 100644 --- a/src/lib/tvgFill.h +++ b/src/lib/tvgFill.h @@ -59,7 +59,7 @@ struct Fill::Impl ~Impl() { - if (dup) delete(dup); + delete(dup); free(colorStops); free(transform); } diff --git a/src/lib/tvgPaint.cpp b/src/lib/tvgPaint.cpp index f5dca0f1..8ba8976a 100644 --- a/src/lib/tvgPaint.cpp +++ b/src/lib/tvgPaint.cpp @@ -380,7 +380,7 @@ Result Paint::composite(std::unique_ptr target, CompositeMethod method) n { auto p = target.release(); if (pImpl->composite(this, p, method)) return Result::Success; - if (p) delete(p); + delete(p); return Result::InvalidArguments; } diff --git a/src/lib/tvgPaint.h b/src/lib/tvgPaint.h index c5d24b6b..c00238a0 100644 --- a/src/lib/tvgPaint.h +++ b/src/lib/tvgPaint.h @@ -75,8 +75,8 @@ namespace tvg delete(compData->target); free(compData); } - if (smethod) delete(smethod); - if (rTransform) delete(rTransform); + delete(smethod); + delete(rTransform); } void method(StrategyMethod* method) diff --git a/src/lib/tvgPictureImpl.h b/src/lib/tvgPictureImpl.h index 04909d1b..645d88d6 100644 --- a/src/lib/tvgPictureImpl.h +++ b/src/lib/tvgPictureImpl.h @@ -77,7 +77,7 @@ struct Picture::Impl ~Impl() { - if (paint) delete(paint); + delete(paint); delete(surface); } diff --git a/src/lib/tvgRender.h b/src/lib/tvgRender.h index babb6f48..9d7bafb6 100644 --- a/src/lib/tvgRender.h +++ b/src/lib/tvgRender.h @@ -145,7 +145,7 @@ struct RenderStroke ~RenderStroke() { free(dashPattern); - if (fill) delete(fill); + delete(fill); } }; @@ -164,8 +164,8 @@ struct RenderShape ~RenderShape() { - if (fill) delete(fill); - if (stroke) delete(stroke); + delete(fill); + delete(stroke); } void fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const diff --git a/src/lib/tvgSaver.cpp b/src/lib/tvgSaver.cpp index 85b5a378..3b4dfddc 100644 --- a/src/lib/tvgSaver.cpp +++ b/src/lib/tvgSaver.cpp @@ -36,7 +36,7 @@ struct Saver::Impl SaveModule* saveModule = nullptr; ~Impl() { - if (saveModule) delete(saveModule); + delete(saveModule); } };