From 1fd6271242b881c26a131289ddfcfe7fd68dbaed Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 14 一月 2025 17:39:20 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BoounionPLC/BoounionPLC.cpp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLC.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLC.cpp
index 3f49216..1ceaee6 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLC.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLC.cpp
@@ -136,6 +136,11 @@
m_model.setWorkDir((LPTSTR)(LPCTSTR)m_strAppDir);
+ // gdi+
+ Gdiplus::GdiplusStartupInput gdiplusStartupInput;
+ Gdiplus::GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, NULL);
+
+
CString strIniFile;
strIniFile.Format(_T("%s\\BoounionPLCconfiguration.ini"), (LPTSTR)(LPCTSTR)m_strAppDir);
int plcTimeout = GetPrivateProfileInt("PLC", "Timeout", 700, strIniFile);
@@ -192,6 +197,9 @@
int CBoounionPLCApp::ExitInstance()
{
+ // gdi+
+ Gdiplus::GdiplusShutdown(m_gdiplusToken);
+
m_model.term();
RX_Term();
MCL_Term();
--
Gitblit v1.9.3