Fix CUI bug

k-ujihara · Oct 4, 2017 · d136187 · d136187
1 parent 8ba76c8
commit d136187
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 53 deletions.
diff --git a/ConcatPDF-Doc/ConcatPDF-History.txt b/ConcatPDF-Doc/ConcatPDF-History.txt
@@ -1,7 +1,9 @@
 ConcatPDF history
 
+1.3.2 (2017-10-05)
+		Fix CUI version bug in v1.3.0 
 1.3.1 (2017-10-01)
-		Fix outline feature
+		Fix outline feature bug in v1.3.0
 1.3.0 (2017-07-23)
 		Update iText library (iText5)
 1.2.5 (2012-06-30)

diff --git a/ConcatPDF-Doc/ConcatPDF-readme.txt b/ConcatPDF-Doc/ConcatPDF-readme.txt
@@ -5,12 +5,12 @@ Sorry this file is written in Japanese. English summary is written in the follow
 
  �\�t�g�� �FConcatPDF
    �@�\   �FPDF�t�@�C���̌���
-�t�@�C�����FConcatPDF-1.3.1.zip
+�t�@�C�����FConcatPDF-1.3.2.zip
   �Ή�OS  �FWindows 7/8/10
  ����m�F �FWindows 7 Professional
   �쐬��  �F�����@��Ɓ@(Kazuya UJIHARA)
   ���J��  �F2004-01-14
-  �X�V��  �F2017-10-01
+  �X�V��  �F2017-10-05
 �\�t�g��ʁF�t���[�\�t�g
   E-Mail  �Fmailto:[email protected]?subject=ConcatPDF
     HP    �Fhttp://kazuyaujihara.github.io/ConcatPDF/

diff --git a/ConcatPDF/ConcatPDFMain.cs b/ConcatPDF/ConcatPDFMain.cs
@@ -22,6 +22,7 @@ You should have received a copy of the GNU General Public License
 
 using iTextSharp.text.pdf;
 using Ujihara.PDF;
+using System.Collections.Generic;
 
 namespace Ujihara.ConcatPDF
 {
@@ -212,6 +213,7 @@ static int Main(string[] args)
                         if (concatenatedFileStream == null)
                             throw new Exception("Missing outfile.");
                         PdfConcatenator con = new PdfConcatenator(concatenatedFileStream, encryptInfo, viewerPreference);
+                        var readers = new List<PdfReader>();
                         try
                         {
                             --i;
@@ -254,13 +256,17 @@ static int Main(string[] args)
                                         pageRanges[k] = new PageRange(start, end);
                                     }
                                 }
-                                con.Append(UriGetFullPath(fileName), pageRanges, appendOption);
+                                PdfReader reader = con.CreatePdfReader(fileName, appendOption);
+                                readers.Add(reader);
+                                con.Append(reader, Path.GetFileNameWithoutExtension(fileName), pageRanges, appendOption);
                             }
                         }
                         finally
                         {
                             con.Close();
                             concatenatedFileStream.Close();
+                            foreach (PdfReader reader in readers)
+                                reader.Close();
                         }
                         return 0;
                     }

diff --git a/ConcatPDFDeploy/ConcatPDFDeploy.vdproj b/ConcatPDFDeploy/ConcatPDFDeploy.vdproj
@@ -70,13 +70,13 @@
         "Entry"
         {
         "MsmKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
-        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
+        "OwnerKey" = "8:_522B1048AE6A4759999BBDD76A941C2B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
-        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
+        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -88,13 +88,13 @@
         "Entry"
         {
         "MsmKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
-        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
+        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
-        "OwnerKey" = "8:_522B1048AE6A4759999BBDD76A941C2B"
+        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -106,25 +106,25 @@
         "Entry"
         {
         "MsmKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
-        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
+        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
-        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
+        "OwnerKey" = "8:_51760B3EC1713F63294F180E01F46771"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
-        "OwnerKey" = "8:_51760B3EC1713F63294F180E01F46771"
+        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
-        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
+        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -148,25 +148,25 @@
         "Entry"
         {
         "MsmKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
-        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
+        "OwnerKey" = "8:_522B1048AE6A4759999BBDD76A941C2B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
-        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
+        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
-        "OwnerKey" = "8:_7029DC6FFC454F4E9F3C355601EFA5B5"
+        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
-        "OwnerKey" = "8:_522B1048AE6A4759999BBDD76A941C2B"
+        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -190,19 +190,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
+        "OwnerKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
+        "OwnerKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_51760B3EC1713F63294F180E01F46771"
+        "OwnerKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -214,19 +214,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B6B50664CF8E7169F4FB36E2AD95140C"
+        "OwnerKey" = "8:_51760B3EC1713F63294F180E01F46771"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_B696B3A4CD396AD75F227C50E79EF1D7"
+        "OwnerKey" = "8:_AD7B26E0C5F94FC8953BAA473A61A875"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D72D6088CE7876A34BE4CD117378A48E"
+        "OwnerKey" = "8:_B0DBD6B24A0E4DBC958B549822910E1C"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -326,7 +326,7 @@
                 {
                 "Name" = "8:.NET Framework"
                 "Message" = "8:[VSDNETMSG]"
-                "FrameworkVersion" = "8:3.5.21022   "
+                "FrameworkVersion" = "8:3.5.21022    "
                 "AllowLaterVersions" = "11:FALSE"
                 "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
                 }
@@ -381,11 +381,6 @@
             "AssemblyAsmDisplayName" = "8:ConcatPDFUI, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd3736a929f259c3, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_51760B3EC1713F63294F180E01F46771"
-                    {
-                    "Name" = "8:ConcatPDFUI.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:ConcatPDFUI.dll"
             "TargetName" = "8:"
@@ -432,11 +427,6 @@
             "AssemblyAsmDisplayName" = "8:itextsharp, Version=5.5.11.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_B696B3A4CD396AD75F227C50E79EF1D7"
-                    {
-                    "Name" = "8:itextsharp.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:itextsharp.dll"
             "TargetName" = "8:"
@@ -463,11 +453,6 @@
             "AssemblyAsmDisplayName" = "8:LibPDF, Version=1.2.6483.31128, Culture=neutral, PublicKeyToken=bd3736a929f259c3, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_B6B50664CF8E7169F4FB36E2AD95140C"
-                    {
-                    "Name" = "8:LibPDF.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:LibPDF.dll"
             "TargetName" = "8:"
@@ -534,11 +519,6 @@
             "AssemblyAsmDisplayName" = "8:PDFLibNet, Version=1.0.6.6, Culture=neutral, PublicKeyToken=26d87f7d66fb2aee, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_D72D6088CE7876A34BE4CD117378A48E"
-                    {
-                    "Name" = "8:PDFLibNet.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:PDFLibNet.dll"
             "TargetName" = "8:"
@@ -675,16 +655,16 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:ConcatPDF 1.3.1"
-        "ProductCode" = "8:{05CB690B-9CAE-4A47-8233-263D8F1206C2}"
-        "PackageCode" = "8:{CEBA1E2A-457F-45C4-B0E9-86A7F2BFA129}"
+        "ProductName" = "8:ConcatPDF 1.3.2"
+        "ProductCode" = "8:{619AFD0F-F38E-4901-A0F9-E9C49BE20431}"
+        "PackageCode" = "8:{62498591-7901-45FB-AF8B-7DF94D58A64D}"
         "UpgradeCode" = "8:{C8E7126C-B0CA-46C5-AD79-61AC6C913738}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.3.1"
+        "ProductVersion" = "8:1.3.2"
         "Manufacturer" = "8:Kazuya Ujihara"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://kazuyaujihara.github.io/ConcatPDF"
@@ -1254,7 +1234,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_522B1048AE6A4759999BBDD76A941C2B"
             {
-            "SourcePath" = "8:..\\SplitPDF\\obj\\x86\\Release\\SplitPDF.exe"
+            "SourcePath" = "8:..\\SplitPDF\\obj\\x86\\Debug\\SplitPDF.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8C18412F955C4C4F8667EF5BDFE9AB30"
@@ -1310,7 +1290,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7029DC6FFC454F4E9F3C355601EFA5B5"
             {
-            "SourcePath" = "8:..\\ConcatPDF\\obj\\x86\\Release\\ConcatPDF.exe"
+            "SourcePath" = "8:..\\ConcatPDF\\obj\\x86\\Debug\\ConcatPDF.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8C18412F955C4C4F8667EF5BDFE9AB30"
@@ -1338,7 +1318,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AD7B26E0C5F94FC8953BAA473A61A875"
             {
-            "SourcePath" = "8:..\\ConcatPDFW\\obj\\x86\\Release\\ConcatPDFW.exe"
+            "SourcePath" = "8:..\\ConcatPDFW\\obj\\x86\\Debug\\ConcatPDFW.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8C18412F955C4C4F8667EF5BDFE9AB30"
@@ -1366,7 +1346,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0DBD6B24A0E4DBC958B549822910E1C"
             {
-            "SourcePath" = "8:..\\DecryptPDF\\obj\\x86\\Release\\DecryptPDF.exe"
+            "SourcePath" = "8:..\\DecryptPDF\\obj\\x86\\Debug\\DecryptPDF.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8C18412F955C4C4F8667EF5BDFE9AB30"

diff --git a/include/VersionInfo.cs b/include/VersionInfo.cs
@@ -2,5 +2,5 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.2.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]