diff --git a/App/Common/FilePath.cs b/App/Common/FilePath.cs
index a024a15..961755b 100644
--- a/App/Common/FilePath.cs
+++ b/App/Common/FilePath.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
diff --git a/App/Model/ColorSpaces/CIELab.cs b/App/Model/ColorSpaces/CIELab.cs
index f669b89..61a101e 100644
--- a/App/Model/ColorSpaces/CIELab.cs
+++ b/App/Model/ColorSpaces/CIELab.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.ComponentModel;
namespace Devcorp.Controls.Design
diff --git a/App/Model/ColorSpaces/CIEXYZ.cs b/App/Model/ColorSpaces/CIEXYZ.cs
index 1560f3d..f343a66 100644
--- a/App/Model/ColorSpaces/CIEXYZ.cs
+++ b/App/Model/ColorSpaces/CIEXYZ.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.ComponentModel;
namespace Devcorp.Controls.Design
diff --git a/App/Model/ColorSpaces/CMYK.cs b/App/Model/ColorSpaces/CMYK.cs
index 14142ec..272b55e 100644
--- a/App/Model/ColorSpaces/CMYK.cs
+++ b/App/Model/ColorSpaces/CMYK.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Devcorp.Controls.Design
{
diff --git a/App/Model/ColorSpaces/ColorSpaceHelper.cs b/App/Model/ColorSpaces/ColorSpaceHelper.cs
index ce3f104..d239d2e 100644
--- a/App/Model/ColorSpaces/ColorSpaceHelper.cs
+++ b/App/Model/ColorSpaces/ColorSpaceHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Text;
@@ -774,26 +774,26 @@ namespace Devcorp.Controls.Design
#region CMYK convert
///
- /// ½«ËÄÉ«·ÖÁ¿£¨±ØÐëΪ 0¡«1£©×ª»»Îª RGB ÑÕÉ«¡£
+ /// 将四色分�(必须为 0~1)转�为 RGB 颜色。
///
- /// Çà
- /// ×Ï
- /// Ȯ
- /// ºÚ
- /// ÑÕÉ«¡£
+ /// �
+ /// ç´«
+ /// 黄
+ /// 黑
+ /// 颜色。
public static Color CMYKtoColor (float c, float m, float y, float k)
{
return CMYKtoColor((double)c, (double)m, (double)y, (double)k);
}
///
- /// ½«ËÄÉ«·ÖÁ¿£¨±ØÐëΪ 0¡«1£©×ª»»Îª RGB ÑÕÉ«¡£
+ /// 将四色分�(必须为 0~1)转�为 RGB 颜色。
///
- /// Çà
- /// ×Ï
- /// Ȯ
- /// ºÚ
- /// ÑÕÉ«¡£
+ /// �
+ /// ç´«
+ /// 黄
+ /// 黑
+ /// 颜色。
public static Color CMYKtoColor (double c, double m, double y, double k)
{
return CMYKtoColor(new CMYK(c,m,y,k));
diff --git a/App/Model/ColorSpaces/HSB.cs b/App/Model/ColorSpaces/HSB.cs
index 19a75a5..71971d1 100644
--- a/App/Model/ColorSpaces/HSB.cs
+++ b/App/Model/ColorSpaces/HSB.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.ComponentModel;
namespace Devcorp.Controls.Design
diff --git a/App/Model/ColorSpaces/HSL.cs b/App/Model/ColorSpaces/HSL.cs
index 5aa670c..e46f936 100644
--- a/App/Model/ColorSpaces/HSL.cs
+++ b/App/Model/ColorSpaces/HSL.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.ComponentModel;
namespace Devcorp.Controls.Design
diff --git a/App/Model/ColorSpaces/RGB.cs b/App/Model/ColorSpaces/RGB.cs
index 52bd246..eb0789d 100644
--- a/App/Model/ColorSpaces/RGB.cs
+++ b/App/Model/ColorSpaces/RGB.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.ComponentModel;
namespace Devcorp.Controls.Design
diff --git a/App/Model/ColorSpaces/YUV.cs b/App/Model/ColorSpaces/YUV.cs
index 7af8aae..94eb116 100644
--- a/App/Model/ColorSpaces/YUV.cs
+++ b/App/Model/ColorSpaces/YUV.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Devcorp.Controls.Design
{
diff --git a/App/Processor/Imaging/WuQuantize.c b/App/Processor/Imaging/WuQuantize.c
index ff38fa2..af7e61d 100644
--- a/App/Processor/Imaging/WuQuantize.c
+++ b/App/Processor/Imaging/WuQuantize.c
@@ -1,4 +1,4 @@
-Having received many constructive comments and bug reports about my previous
+Having received many constructive comments and bug reports about my previous
C implementation of my color quantizer (Graphics Gems vol. II, p. 126-133),
I am posting the following second version of my program (hopefully 100%
healthy) as a reply to all those who are interested in the problem.
diff --git a/App/Processor/Mupdf/MuPage.cs b/App/Processor/Mupdf/MuPage.cs
index 285baa5..0e45104 100644
--- a/App/Processor/Mupdf/MuPage.cs
+++ b/App/Processor/Mupdf/MuPage.cs
@@ -1,32 +1,32 @@
-using System;
+using System;
using System.Drawing;
namespace MuPdfSharp
{
public sealed class MuPage : IDisposable
{
- #region ·ÇÍйÜ×ÊÔ´³ÉÔ±
+ #region �托管资��员
private ContextHandle _context;
private DocumentHandle _document;
private PageHandle _page;
private DisplayListHandle _displayList;
#endregion
- #region ÍйÜ×ÊÔ´³ÉÔ±
+ #region 托管资��员
static readonly ImageRendererOptions __defaultOptions = new ImageRendererOptions ();
MuCookie _cookie;
MuTextPage _TextPage;
bool _flattened;
- /// »ñÈ¡µ±Ç°Ò³ÃæµÄÒ³Âë¡£
+ /// 获å�–当å‰�页é�¢çš„页ç �。
public int PageNumber { get; private set; }
- /// »ñÈ¡µ±Ç°Ò³ÃæµÄ³ß´ç£¨×óϽÇ×ø±êÖÃΪ¡°0,0¡±£©¡£ÈçÐè»ñÈ¡Ò³Ãæ×ÖµäÖеÄÔʼ¿ÉÊÓÇøÓò£¬ÇëʹÓà ÊôÐÔ¡£
+ /// 获å�–当å‰�页é�¢çš„尺寸(左下角å��æ ‡ç½®ä¸ºâ€œ0,0â€�)。如需获å�–页é�¢å—å…¸ä¸çš„原始å�¯è§†åŒºåŸŸï¼Œè¯·ä½¿ç”¨ 属性。
public Rectangle Bound {
get {
return NativeMethods.BoundPage (_context, _page);
}
}
- /// »ñÈ¡µ±Ç°Ò³Ãæ¿ÉÊÓÇøÓòµÄ×ø±ê¼°³ß´ç¡£
+ /// 获å�–当å‰�页é�¢å�¯è§†åŒºåŸŸçš„å��æ ‡å�Šå°ºå¯¸ã€‚
public Rectangle VisualBound => Matrix.Identity.RotateTo(Rotation).Transform(VisualBox);
public Rectangle ArtBox => LookupPageBox("ArtBox");
@@ -70,46 +70,46 @@ namespace MuPdfSharp
}
catch (AccessViolationException) {
_page.DisposeHandle ();
- throw new MuPdfException ("ÎÞ·¨¼ÓÔØµÚ " + pageNumber + " Ò³¡£");
+ throw new MuPdfException ("æ— æ³•åŠ è½½ç¬¬ " + pageNumber + " 页。");
}
}
/////
- ///// »ñȡָ¶¨ÇøÓòµÄÎı¾¡£
+ ///// 获�指定区域的文本。
/////
- ///// ÇøÓò¡£
- ///// ÇøÓòÄÚµÄÎı¾¡£
+ ///// 区域。
+ ///// 区域内的文本。
//public string GetSelection (Rectangle selection) {
// return Interop.DecodeUtf8String (NativeMethods.CopySelection (_context, GetTextPage (), selection));
//}
/////
- ///// »ñȡָ¶¨ÇøÓòµÄÎı¾¡£
+ ///// 获�指定区域的文本。
/////
- ///// ÇøÓò¡£
- ///// ÇøÓòÄÚµÄÎı¾¡£
+ ///// 区域。
+ ///// 区域内的文本。
//public List HighlightSelection (Rectangle selection) {
// var l =
// return Interop.DecodeUtf8String (NativeMethods.HighlightSelection (_context, _page, selection));
//}
///
- /// ʹÓÃĬÈϵÄÅäÖÃäÖÈ¾Ò³Ãæ¡£
+ /// 使用默认的�置渲染页�。
///
- /// Ò³ÃæµÄ¿í¶È¡£
- /// Ò³ÃæµÄ¸ß¶È¡£
- /// äÖȾºóÉú³ÉµÄ ¡£
+ /// 页�的宽度。
+ /// 页�的高度。
+ /// 渲染�生�的 。
public FreeImageAPI.FreeImageBitmap RenderPage (int width, int height) {
return RenderPage (width, height, __defaultOptions);
}
///
- /// ʹÓÃÖ¸¶¨µÄÅäÖÃäÖÈ¾Ò³Ãæ¡£
+ /// 使用指定的�置渲染页�。
///
- /// Ò³ÃæµÄ¿í¶È¡£
- /// Ò³ÃæµÄ¸ß¶È¡£
- /// äÖȾѡÏî¡£
- /// äÖȾºóÉú³ÉµÄ ¡£
+ /// 页�的宽度。
+ /// 页�的高度。
+ /// 渲染选项。
+ /// 渲染�生�的 。
public FreeImageAPI.FreeImageBitmap RenderPage (int width, int height, ImageRendererOptions options) {
using (var pix = InternalRenderPage (width, height, options)) {
if (pix != null) {
@@ -120,12 +120,12 @@ namespace MuPdfSharp
}
///
- /// ʹÓÃÖ¸¶¨µÄÅäÖÃäÖÈ¾Ò³Ãæ¡£
+ /// 使用指定的�置渲染页�。
///
- /// Ò³ÃæµÄ¿í¶È¡£
- /// Ò³ÃæµÄ¸ß¶È¡£
- /// äÖȾѡÏî¡£
- /// äÖȾºóÉú³ÉµÄ ¡£
+ /// 页�的宽度。
+ /// 页�的高度。
+ /// 渲染选项。
+ /// 渲染�生�的 。
public Bitmap RenderBitmapPage (int width, int height, ImageRendererOptions options) {
using (var pix = InternalRenderPage (width, height, options)) {
if (pix != null) {
@@ -156,7 +156,7 @@ namespace MuPdfSharp
//}
}
if (_cookie.ErrorCount > 0) {
- System.Diagnostics.Debug.WriteLine("ÔÚµÚ " + PageNumber + " Ò³ÓÐ " + _cookie.ErrorCount + " ¸ö´íÎó¡£");
+ System.Diagnostics.Debug.WriteLine("在第 " + PageNumber + " 页有 " + _cookie.ErrorCount + " 个错误。");
}
return _displayList;
}
@@ -225,7 +225,7 @@ namespace MuPdfSharp
}
catch (AccessViolationException) {
pix.DisposeHandle ();
- throw new MuPdfException ("ÎÞ·¨äÖÈ¾Ò³Ãæ£º" + PageNumber);
+ throw new MuPdfException ("æ— æ³•æ¸²æŸ“é¡µé�¢ï¼š" + PageNumber);
}
}
@@ -276,9 +276,9 @@ namespace MuPdfSharp
}
///
- /// »ñÈ¡Ò³ÃæÄÚÈݵÄʵ¼Ê¸²¸Ç·¶Î§¡£
+ /// 获�页�内容的实际覆盖范围。
///
- /// °üº¬Ò³ÃæÄÚÈݵÄ×îС ¡£
+ /// 包�页�内容的最� 。
public Rectangle GetContentBoundary () {
var b = Bound;
var o = b;
@@ -292,25 +292,25 @@ namespace MuPdfSharp
return o;
}
catch (AccessViolationException) {
- throw new MuPdfException ("ÎÞ·¨»ñÈ¡Ò³ÃæÄÚÈݱ߿ò£º" + PageNumber);
+ throw new MuPdfException ("æ— æ³•èŽ·å�–页é�¢å†…容边框:" + PageNumber);
}
}
}
- #region ʵÏÖ IDisposable ½Ó¿ÚµÄÊôÐԺͷ½·¨
+ #region 实现 IDisposable 接�的属性和方法
private bool disposed;
public void Dispose () {
Dispose (true);
- GC.SuppressFinalize (this); // ÒÖÖÆÎö¹¹º¯Êý
+ GC.SuppressFinalize (this); // 抑制�构函数
}
- /// ÊÍ·ÅÓÉ MuPdfPage Õ¼ÓõÄ×ÊÔ´¡£
- /// ÊÇ·ñÊÖ¶¯ÊÍ·ÅÍйÜ×ÊÔ´¡£
+ /// 释放由 MuPdfPage å� 用的资æº�。
+ /// 是�手动释放托管资�。
[System.Diagnostics.CodeAnalysis.SuppressMessage ("Microsoft.Usage", "CA2213:DisposableFieldsShouldBeDisposed", MessageId = "_page")]
void Dispose (bool disposing) {
if (!disposed) {
if (disposing) {
- #region ÊÍ·ÅÍйÜ×ÊÔ´
+ #region 释放托管资�
if (_TextPage != null) {
_TextPage.Dispose();
}
@@ -318,8 +318,8 @@ namespace MuPdfSharp
#endregion
}
- #region ÊÍ·Å·ÇÍйÜ×ÊÔ´
- // ×¢ÒâÕâÀï²»ÊÇḬ̈߳²È«µÄ
+ #region 释放�托管资�
+ // 注�这里�是线程安全的
//int retry = 0;
//_cookie.CancelAsync ();
//while (_cookie.IsRunning && ++retry < 10) {
@@ -333,8 +333,8 @@ namespace MuPdfSharp
disposed = true;
}
- // Îö¹¹º¯ÊýÖ»ÔÚδµ÷Óà Dispose ·½·¨Ê±µ÷ÓÃ
- // ÅÉÉúÀàÖв»±ØÔÙÌṩÎö¹¹º¯Êý
+ // �构函数�在未调用 Dispose 方法时调用
+ // 派生类ä¸ä¸�å¿…å†�æ��ä¾›æž�构函数
~MuPage () {
Dispose (false);
}
diff --git a/App/Processor/Mupdf/PageLabelCollection.cs b/App/Processor/Mupdf/PageLabelCollection.cs
index ea4d7f8..abf04cc 100644
--- a/App/Processor/Mupdf/PageLabelCollection.cs
+++ b/App/Processor/Mupdf/PageLabelCollection.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -32,9 +32,9 @@ namespace MuPdfSharp
}
///
- /// Ìí¼ÓÒ³Âë±êÇ©¡£È缯ºÏÖдæÔÚÏàͬҳÂëµÄÒ³Âë±êÇ©£¬ÔòÏȽ«¾ÉµÄ±êǩɾ³ý£¬ÔÙÌí¼ÓеÄÒ³Âë±êÇ©¡£
+ /// æ·»åŠ é¡µç �æ ‡ç¾ã€‚如集å�ˆä¸å˜åœ¨ç›¸å�Œé¡µç �的页ç �æ ‡ç¾ï¼Œåˆ™å…ˆå°†æ—§çš„æ ‡ç¾åˆ 除,å†�æ·»åŠ æ–°çš„é¡µç �æ ‡ç¾ã€‚
///
- /// ÐèÒªÌí¼ÓµÄÒ³Âë±êÇ©¡£
+ /// 需è¦�æ·»åŠ çš„é¡µç �æ ‡ç¾ã€‚
public void Add (PageLabel label) {
Remove (label);
_labels.Add (label);
@@ -42,10 +42,10 @@ namespace MuPdfSharp
}
///
- /// ¸ù¾Ý´«ÈëµÄÒ³Â룬·µ»Øµ±Ç°Ò³Âë±êÇ©¼¯ºÏ¸ñʽ»¯ºóÉú³ÉµÄÒ³Âë¡£
+ /// æ ¹æ�®ä¼ 入的页ç �,返回当å‰�页ç �æ ‡ç¾é›†å�ˆæ ¼å¼�化å�Žç”Ÿæˆ�的页ç �。
///
- /// ¾ø¶ÔÒ³Âë¡£
- /// ¸ñʽ»¯ºóµÄÒ³ÂëÎı¾¡£
+ /// ç»�对页ç �。
+ /// æ ¼å¼�化å�Žçš„页ç �文本。
public string Format (int pageNumber) {
var l = _labels.Count;
if (l == 0) {
@@ -75,10 +75,10 @@ namespace MuPdfSharp
}
///
- /// ·µ»Ø¼¯ºÏÖÐÊÇ·ñ°üº¬¾ßÓÐÓë ÏàͬÆðʼҳÂëµÄÒ³Âë±êÇ©¡£
+ /// 返回集å�ˆä¸æ˜¯å�¦åŒ…å�«å…·æœ‰ä¸Ž 相å�Œèµ·å§‹é¡µç �的页ç �æ ‡ç¾ã€‚
///
- /// ÐèÒª¼ì²éÆðʼҳÂëµÄÒ³Âë±êÇ©¡£
- /// Èç°üº¬ÏàͬҳÂëµÄÒ³Âë±êÇ©£¬·µ»Ø true£¬·ñÔò·µ»Ø false¡£
+ /// 需è¦�检查起始页ç �的页ç �æ ‡ç¾ã€‚
+ /// 如包å�«ç›¸å�Œé¡µç �的页ç �æ ‡ç¾ï¼Œè¿”回 true,å�¦åˆ™è¿”回 false。
public bool Contains (PageLabel item) {
for (int i = _labels.Count - 1; i >= 0; i--) {
if (_labels[i].FromPageNumber == item.FromPageNumber) {
@@ -101,10 +101,10 @@ namespace MuPdfSharp
}
///
- /// ɾ³ý¼¯ºÏÖоßÓÐÓë ÏàͬÆðʼҳÂëµÄÒ³Âë±êÇ©¡£
+ /// åˆ é™¤é›†å�ˆä¸å…·æœ‰ä¸Ž 相å�Œèµ·å§‹é¡µç �的页ç �æ ‡ç¾ã€‚
///
- /// ÐèҪɾ³ýµÄÒ³Âë±êÇ©¡£
- /// Èç°üº¬ÏàͬҳÂëµÄÒ³Âë±êÇ©£¬·µ»Ø true£¬·ñÔò·µ»Ø false¡£
+ /// 需è¦�åˆ é™¤çš„é¡µç �æ ‡ç¾ã€‚
+ /// 如包å�«ç›¸å�Œé¡µç �的页ç �æ ‡ç¾ï¼Œè¿”回 true,å�¦åˆ™è¿”回 false。
public bool Remove (PageLabel item) {
for (int i = _labels.Count - 1; i >= 0; i--) {
if (_labels[i].FromPageNumber == item.FromPageNumber) {
diff --git a/授��议.txt b/授��议.txt
index 418aa30..d5a8013 100644
--- a/授��议.txt
+++ b/授��议.txt
@@ -1,4 +1,4 @@
-《PDF 补��(PDFPatcher)》软件最终用户授��议
+《PDF 补��(PDFPatcher)》软件最终用户授��议
--------------------------------------------------------------------------------
diff --git a/更新历�.txt b/更新历�.txt
index adcdd7e..63100d9 100644
--- a/更新历�.txt
+++ b/更新历�.txt
@@ -1,4 +1,4 @@
-1.0.0.0 2021年12月23日
+1.0.0.0 2021年12月23日
新增功能:
第一个开放æº�代ç �版本。
修改了授��议。