Description: fix cppcheck

IssueNo: https://gitee.com/openharmony/graphic_utils/issues/I5W10S
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: zhouyj <zhouyuanjie1@huawei.com>
This commit is contained in:
Zhouyj_zju
2022-10-17 11:02:39 +08:00
parent 94e9349552
commit 56fb909f5c
3 changed files with 11 additions and 34 deletions
+10 -25
View File
@@ -15,35 +15,20 @@
#include "gfx_utils/trans_affine.h"
namespace OHOS {
const uint8_t PARL_INDEX_SIZE = 6;
const TransAffine& TransAffine::ParlToParl(const float* src,
const float* dst)
{
data_[0] = src[2] - src[0];
data_[3] = src[3] - src[1];
data_[1] = src[4] - src[0];
data_[4] = src[5] - src[1];
data_[2] = src[0];
data_[5] = src[1];
Invert();
Multiply(TransAffine(dst[2] - dst[0], dst[3] - dst[1],
dst[4] - dst[0], dst[5] - dst[1],
dst[0], dst[1]));
return *this;
}
const TransAffine& TransAffine::RectToParl(float x1, float y1,
float x2, float y2,
const float* parl)
{
float src[PARL_INDEX_SIZE];
src[0] = x1;
src[1] = y1;
src[2] = x2;
src[3] = y1;
src[4] = x2;
src[5] = y2;
ParlToParl(src, parl);
data_[0] = x2 - x1;
data_[3] = 0; // y1 - y1
data_[1] = x2 - x1;
data_[4] = y2 - y1;
data_[2] = x1;
data_[5] = y1;
Invert();
Multiply(TransAffine(parl[2] - parl[0], parl[3] - parl[1],
parl[4] - parl[0], parl[5] - parl[1],
parl[0], parl[1]));
return *this;
}
+1 -1
View File
@@ -450,7 +450,7 @@ struct Rgba8T {
BASE_MSB = 1 << (BASE_SHIFT - 1)
};
Rgba8T() {}
Rgba8T() : red(0), green(0), blue(0), alpha(0) {}
/**
* @brief Rgba8T Constructor
-8
View File
@@ -55,14 +55,6 @@ public:
{
data_[index] = value;
}
/**
* @brief Convert the original parallelogram to the target parallelogram
* @param src Original parallelogram
* @param dst Target parallelogram
* @since 1.0
* @version 1.0
*/
const TransAffine& ParlToParl(const float* src, const float* dst);
/**
* @brief Convert the original parallelogram to the target parallelogram
* @param x1 x-axis coordinate of the upper left corner of the rectangle