wiera updates

PdfiumViewer.Demo/MainForm.cs

@@ -280,15 +280,9 @@ private void _hideBookmarks_Click(object sender, EventArgs e)
 
         private void deleteCurrentPageToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            // PdfRenderer does not support changes to the loaded document,
-            // so we fake it by reloading the document into the renderer.
-
             int page = pdfViewer1.Renderer.Page;
-            var document = pdfViewer1.Document;
-            pdfViewer1.Document = null;
-            document.DeletePage(page);
-            pdfViewer1.Document = document;
-            pdfViewer1.Renderer.Page = page;
+            pdfViewer1.Document.DeletePage(page);
+            pdfViewer1.Renderer.ReloadDocument();
         }
 
         private void rotate0ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -313,15 +307,9 @@ private void rotate270ToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void Rotate(PdfRotation rotate)
         {
-            // PdfRenderer does not support changes to the loaded document,
-            // so we fake it by reloading the document into the renderer.
-
             int page = pdfViewer1.Renderer.Page;
-            var document = pdfViewer1.Document;
-            pdfViewer1.Document = null;
-            document.RotatePage(page, rotate);
-            pdfViewer1.Document = document;
-            pdfViewer1.Renderer.Page = page;
+            pdfViewer1.Document.RotatePage(page, rotate);
+            pdfViewer1.Renderer.ReloadDocument();
         }
 
         private void showRangeOfPagesToolStripMenuItem_Click(object sender, EventArgs e)
@@ -395,5 +383,10 @@ private void pdfViewerContextMenu_Opening(object sender, CancelEventArgs e)
         {
             copyToolStripMenuItem.Enabled = pdfViewer1.Renderer.IsTextSelected;
         }
+
+        private void _textMode_Click(object sender, EventArgs e)
+        {
+            pdfViewer1.Renderer.CursorMode = (pdfViewer1.Renderer.CursorMode == PdfCursorMode.Pan) ? PdfCursorMode.TextSelection : PdfCursorMode.Pan;
+        }
     }
 }

PdfiumViewer.Demo/MainForm.resx

@@ -257,6 +257,21 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="_textMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="_showToolbar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PdfiumViewer.Demo/PdfRangeDocument.cs

@@ -303,11 +303,6 @@ public int CountCharacters(int page)
             return _document.CountCharacters(page);
         }
 
-        public List<PdfRectangle> GetTextRectangles(int page, int startIndex, int count)
-        {
-            return _document.GetTextRectangles(page, startIndex, count);
-        }
-
         private int TranslatePage(int page)
         {
             if (page < 0 || page >= PageCount)

PdfiumViewer.Demo/PdfiumViewer.Demo.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props')" />
-  <Import Project="..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" />
+  <Import Project="..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props" Condition="Exists('..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props')" />
+  <Import Project="..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props" Condition="Exists('..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -160,8 +160,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props'))" />
-    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props'))" />
+    <Error Condition="!Exists('..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props'))" />
+    <Error Condition="!Exists('..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

PdfiumViewer.Demo/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PdfiumViewer.Native.x86.v8-xfa" version="2017.11.2.204" targetFramework="net20" />
-  <package id="PdfiumViewer.Native.x86_64.v8-xfa" version="2017.11.2.204" targetFramework="net20" />
+  <package id="PDFium.x64.v8-xfa" version="4194.0.0" targetFramework="net20" />
+  <package id="PDFium.x86.v8-xfa" version="4194.0.0" targetFramework="net20" />
 </packages>

PdfiumViewer.Test/PdfiumViewer.Test.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.Test</RootNamespace>
     <AssemblyName>PdfiumViewer.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">

PdfiumViewer.Test/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>

PdfiumViewer.WPFDemo/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    </startup>
+</configuration>

PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj

@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.WPFDemo</RootNamespace>
     <AssemblyName>PdfiumViewer.WPFDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>