From ad1003ddb3f9a50627b6a0f33888068f9dcbfcb1 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 12:29:28 +0800
Subject: [PATCH] update native
---
RtspFace/PL_Paint.h | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/RtspFace/PL_Paint.h b/RtspFace/PL_Paint.h
index 9b1a0e1..66ada4c 100644
--- a/RtspFace/PL_Paint.h
+++ b/RtspFace/PL_Paint.h
@@ -4,6 +4,8 @@
#include "PipeLine.h"
#include "GraphicHelper.h"
+#define ENABLE_WTEXT
+
/*
PLPaint Language:
COLOR F/B,R,G,B,A
@@ -22,7 +24,8 @@
PLPLC_PEN,
PLPLC_RECT,
PLPLC_TEXT,
- PLPLC_WTEXT,
+ PLPLC_WTEXT,
+
PLPLC__LAST
};
@@ -30,21 +33,13 @@
{
int val_i;
float val_f;
- char val_s[10];
+ char val_s[20];
- 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];
- }
+ 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);
+ PLPLType(const wchar_t* _val_s);
};
typedef std::vector<PLPLCmd> plplc_vec_t;
@@ -55,27 +50,24 @@
plplc_vec_t cmds;
plplt_vec_t params;
- PLGH_Color_RGBA color_front;
- PLGH_Color_RGBA color_back;
- int fill;
- PLGH_Pen pen;
- void* cvxText;
- PLPLContext() :
- cmds(), params(), color_front(), color_back(), fill(0), pen(0, 0), cvxText(nullptr)
- {}
+ PLGH_Color_RGBA color_front;
+ PLGH_Color_RGBA color_back;
+ int fill;
+ PLGH_Pen pen;
+ void* cvxText;
- ~PLPLContext()
- {
- delete(cvxText);
- cvxText = nullptr;
- }
+ PLPLContext() :
+ cmds(), params(), color_front(), color_back(), fill(0), pen(0, 0), cvxText(nullptr)
+ {}
+
+ ~PLPLContext();
};
struct PL_Paint_Config
{
bool copyData;
PLPLContext* plplCtx;
- std::string fontPath;
+ std::string fontPath;
PL_Paint_Config() :
copyData(false), plplCtx(nullptr), fontPath()
@@ -95,8 +87,8 @@
virtual bool gain(PipeMaterial& pm);
private:
- static bool pay_breaker_MBFT_YUV(const PipeMaterial* pm, void* args);
-
+ static bool pay_breaker_MBFT(const PipeMaterial* pm, void* args);
+
private:
void* internal;
};
--
Gitblit v1.8.0