From b617f235fa2f7eb53714d89ba8c4b4ddcb336787 Mon Sep 17 00:00:00 2001 From: csh Date: Wed, 15 Nov 2023 10:51:24 +0800 Subject: [PATCH] v1.5.1 --- funcext/TSOffice/TOfficeObj.tsf | 2 +- funcext/TSOffice/TSDocxFile.tsf | 2 +- funcext/TSOffice/TSUtils/TSImage.tsf | 8 +++++--- funcext/TSOffice/TSXlsxFile.tsf | 2 +- 更新日志.md | 6 ++++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf index ca0f457..734a341 100644 --- a/funcext/TSOffice/TOfficeObj.tsf +++ b/funcext/TSOffice/TOfficeObj.tsf @@ -1,4 +1,4 @@ -// Version 1.5.0 +// Version 1.5.1 Function TOfficeObj(n); Begin diff --git a/funcext/TSOffice/TSDocxFile.tsf b/funcext/TSOffice/TSDocxFile.tsf index 805e0ba..96ee594 100644 --- a/funcext/TSOffice/TSDocxFile.tsf +++ b/funcext/TSOffice/TSDocxFile.tsf @@ -1,4 +1,4 @@ -// Version 1.5.0 +// Version 1.5.1 Type TSDocxFile = Class ///Version: V1.0 2022-09-20 diff --git a/funcext/TSOffice/TSUtils/TSImage.tsf b/funcext/TSOffice/TSUtils/TSImage.tsf index 2c9f8d5..5d04d1d 100644 --- a/funcext/TSOffice/TSUtils/TSImage.tsf +++ b/funcext/TSOffice/TSUtils/TSImage.tsf @@ -71,12 +71,14 @@ Type TSImage = Class Begin des1 := 0xff; des2 := 0xc0; + des3 := 0xc2; flag := 1; while flag do begin - stringObj_.Read(byte1, 1); - stringObj_.Read(byte2, 1); - if byte1 = des1 and byte2 = des2 then flag := 0; + r1 := stringObj_.Read(byte1, 1); + r2 := stringObj_.Read(byte2, 1); + if r1 = 0 or r2 = 0 then break; + if byte1 = des1 and (byte2 = des2 or byte2 = des3) then flag := 0; end if flag then return array(0, 0); stringObj_.Read(tmp, 3); diff --git a/funcext/TSOffice/TSXlsxFile.tsf b/funcext/TSOffice/TSXlsxFile.tsf index 26e2e32..3c08a1a 100644 --- a/funcext/TSOffice/TSXlsxFile.tsf +++ b/funcext/TSOffice/TSXlsxFile.tsf @@ -1,4 +1,4 @@ -// Version 1.5.0 +// Version 1.5.1 Type TSXlsxFile = Class ///Version: V1.0 2022-08-08 diff --git a/更新日志.md b/更新日志.md index bf204a7..de91861 100644 --- a/更新日志.md +++ b/更新日志.md @@ -1,5 +1,11 @@ # 更新日志 +## 2023-11-15 + +### V1.5.1 + +1. 支持识别图片中含有`0xffc2`段的jpg格式的大小 + ## 2023-11-14 ### V1.5.0