From 9eb5228f00ff356ac0128abfbb1c85a6abceeca7 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 19 七月 2017 15:39:47 +0800
Subject: [PATCH] 图像缩放模块，中文字体支持模块。
---
RtspFace/PL_Paint.h | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/RtspFace/PL_Paint.h b/RtspFace/PL_Paint.h
index 9e7edab..9b1a0e1 100644
--- a/RtspFace/PL_Paint.h
+++ b/RtspFace/PL_Paint.h
@@ -22,7 +22,7 @@
PLPLC_PEN,
PLPLC_RECT,
PLPLC_TEXT,
-
+ PLPLC_WTEXT,
PLPLC__LAST
};
@@ -30,12 +30,17 @@
{
int val_i;
float val_f;
- char val_s[sizeof(int)];
+ char val_s[10];
PLPLType() : val_i(0) {}
PLPLType(int _val_i) : val_i(_val_i) {}
PLPLType(float _val_f) : val_f(_val_f) {}
PLPLType(const char* _val_s)
+ {
+ for (int i = 0; i < sizeof(val_s); i++)
+ val_s[i] = _val_s[i];
+ }
+ PLPLType(const wchar_t* _val_s)
{
for (int i = 0; i < sizeof(val_s); i++)
val_s[i] = _val_s[i];
@@ -54,19 +59,26 @@
PLGH_Color_RGBA color_back;
int fill;
PLGH_Pen pen;
-
+ void* cvxText;
PLPLContext() :
- cmds(), params(), color_front(), color_back(), fill(0), pen(0, 0)
+ cmds(), params(), color_front(), color_back(), fill(0), pen(0, 0), cvxText(nullptr)
{}
+
+ ~PLPLContext()
+ {
+ delete(cvxText);
+ cvxText = nullptr;
+ }
};
struct PL_Paint_Config
{
bool copyData;
PLPLContext* plplCtx;
+ std::string fontPath;
PL_Paint_Config() :
- copyData(false), plplCtx(nullptr)
+ copyData(false), plplCtx(nullptr), fontPath()
{ }
};
--
Gitblit v1.8.0