From cc011c544302b6c757e205b8f0387b9edceb203d Mon Sep 17 00:00:00 2001
From: matsuo <matsuo@screen.co.jp>
Date: Wed, 15 Sep 2021 17:55:09 +0900
Subject: [PATCH] =?UTF-8?q?CSRender=20v1.3.0.5=20/Para=20(=E4=B8=A6?=
 =?UTF-8?q?=E8=A1=8C=E5=87=A6=E7=90=86=E6=95=B0=E3=81=AE=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CSRender/CSRender.csproj            |  2 +-
 CSRender/Program.cs                 | 24 +++++++++++++++++-------
 CSRender/Properties/AssemblyInfo.cs |  5 +++--
 CSRender_ReadMe.txt                 |  8 +++++++-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/CSRender/CSRender.csproj b/CSRender/CSRender.csproj
index d196c6d..8a1dbe6 100644
--- a/CSRender/CSRender.csproj
+++ b/CSRender/CSRender.csproj
@@ -80,7 +80,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Annotated\Windows.winmd</HintPath>
+      <HintPath>C:\Program Files (x86)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Annotated\Windows.winmd</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="WindowsBase" />
diff --git a/CSRender/Program.cs b/CSRender/Program.cs
index cc0867e..74eb522 100644
--- a/CSRender/Program.cs
+++ b/CSRender/Program.cs
@@ -40,9 +40,11 @@ namespace CSRenderMain {
 		public string pdfPath2 = "";       //比較ファイル
 		[DataMember]
 		public string outuptImageDir = "";      // /O
-		[DataMember]
-		public string dpi = "72.0";   // /D 
-		[DataMember]
+        [DataMember]
+        public string dpi = "72.0";   // /D 
+        [DataMember]
+        public int para = 4;   // 並行数 
+        [DataMember]
 		public string boxSelect = "Crop";   // /B<x>
 		[DataMember]
 		public string pageRange = "1-*";    // /P
@@ -129,8 +131,9 @@ namespace CSRenderMain {
 				+ $"\n"
 				+ $"[ELSE ] その他のオプション\n"
 				+ $"\t/PDFium <0|1>:PDFiumライブラリを使う,デフォルト=1\n"
-				+ $"\t/NoExeSepa :実行分離しない(遅い)\n"
-				+ $"\t内部コマンド：/SubExe <WCF_PipeAddress> :実行分離,PDF単位で別Processで処理\n"
+                + $"\t/NoExeSepa :実行分離しない(遅い)\n"
+                + $"\t/para <並行数>:並行数を指定（デフォルト4)\n"
+                + $"\t内部コマンド：/SubExe <WCF_PipeAddress> :実行分離,PDF単位で別Processで処理\n"
 				+ $"\n"
 				+ $"/H or /?  : This help\n"
 
@@ -238,7 +241,14 @@ namespace CSRenderMain {
 						DispHelp();
 						return -1;
 					}
-				} else if (isOpt("/P")) {
+                } else if (isOpt("/Para")) {
+                    string paraNum = (qu.Count > 0) ? qu.Dequeue() : "";// next word.
+                    if (!int.TryParse(paraNum, out pm.para)) {
+                        Console.WriteLine($"並行数が不正です:/para {paraNum}");
+                        DispHelp();
+                        return -1;
+                    }
+                } else if (isOpt("/P")) {
 					pm.pageRange = (qu.Count > 0) ? qu.Dequeue() : "";// next word.
 				} else if (isOpt("/JPG", "/JPEG")) {
 					pm.imageType = "JPG";
@@ -529,7 +539,7 @@ namespace CSRenderMain {
 				//逆に遅くなる UWPコール(render）は対応していない？
 				if (pm.bExeSepa &&(!pm.bFC)) { // FCモードは除外します。
 					var tokenSource = new CancellationTokenSource();
-					ParallelOptions options = new ParallelOptions { MaxDegreeOfParallelism = 4 };
+					ParallelOptions options = new ParallelOptions { MaxDegreeOfParallelism = pm.para };
 					ret = 0;//Success
 					var loopResult = Parallel.For(0,pdfPathLstBoth.Count, options, (index,lpState) => {
 						//for (var index = 0; index < pdfPathLstBoth.Count; index++) {
diff --git a/CSRender/Properties/AssemblyInfo.cs b/CSRender/Properties/AssemblyInfo.cs
index 988fb04..be2612b 100644
--- a/CSRender/Properties/AssemblyInfo.cs
+++ b/CSRender/Properties/AssemblyInfo.cs
@@ -32,9 +32,10 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.4")]
-[assembly: AssemblyFileVersion("1.3.0.4")]
+[assembly: AssemblyVersion("1.3.0.5")]
+[assembly: AssemblyFileVersion("1.3.0.5")]
 
+// rev:1.3.0.5:2021/09/14 :/Paraで並行プロセス最大値の設定追加
 // rev:1.3.0.4:2021/04/29 :Helpの記述抜け "/Result"の対応
 // rev:1.3.0.3:2020/11/22 :/Result <比較結果> を実装。diff画像を出力
 // rev:1.3.0.2: streamのフラッシュミス 比較時に差異があるとクラッシュしていた。
diff --git a/CSRender_ReadMe.txt b/CSRender_ReadMe.txt
index 07b8b25..9abb019 100644
--- a/CSRender_ReadMe.txt
+++ b/CSRender_ReadMe.txt
@@ -1,9 +1,14 @@
+rev:1.3.0.5:2021/09/14 :/Para�ŕ��s�v���Z�X�ő�l�̐ݒ�lj�
+
+rev:1.3.0.4:2021/04/29 :Help�̋L�q���� "/Result"�̑Ή�
+
+V1.3.0.3:2020/11/22 :/Result <��r����> �������Bdiff�摜���o��
+
 V1.3.0.3:2020/11/22 :/Result <��r����> �������Bdiff�摜���o��
 
 V1.3.0.2:2020/07/11 :�s��C��
 	��r���ɍ��ق�����ƃN���b�V�����Ă����Bstream�̃t���b�V���~�X 
 
-
 V1.3.0.1:2020/06/20 :�s��C��
 	�Q�‚̃t�@�C���̔�r�����OK�ɂȂ��Ă����”\��������̂ŏC��
 
@@ -57,6 +62,7 @@ CSRender.exe [/<Opts>] <PDFPath or PDFDir>
 [ELSE ] ���̑��̃I�v�V����
 	/PDFium <0|1>:PDFium���C�u�������g��,�f�t�H���g=1
 	/NoExeSepa :���s�������Ȃ�(�x��)
+	/para <���s��>:���s�����w��i�f�t�H���g4)
 	�����R�}���h�F/SubExe <WCF_PipeAddress> :���s����,PDF�P�ʂŕ�Process�ŏ���
 
 /H or /?  : This help
-- 
2.22.0