sync main with develop for upcoming RC 18.0.5PlusP1n

.github/workflows/test-net-framework-samples.yml

@@ -93,6 +93,7 @@ jobs:
               'Other/StreamIO/',
               'Printing/PrintPDF/',
               'Printing/PrintPDFGUI/',
+              'Security/AddDigitalSignature/',
               'Security/AddRegexRedaction/',
               'Security/Redactions/',
               'Text/AddGlyphs/',

ContentModification/ChangeLayerConfiguration/ChangeLayerConfiguration.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{C5493EAE-45F6-4502-9D26-5BFEC574729F}</ProjectGuid>
+    <ProjectGuid>{E2C4287F-5817-49CE-912D-9A9F29DBC0DD}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>ChangeLayerConfiguration</RootNamespace>
     <AssemblyName>ChangeLayerConfiguration</AssemblyName>

Display/DotNETViewerComponent/DotNETView.cs

@@ -906,33 +906,36 @@ private IList<Quad> GetPageQuads(int pageNum)
                     bool letter = false;
                     Quad q = null;
                     IList<Quad> charQuads = word.CharQuads;
-                    for (int i = 0; i < text.Length; ++i)
+                    if (charQuads.Count == text.Length)
                     {
-                        if (char.IsLetter(text, i) != letter)
-                        {
-                            if (q != null) quads.Add(q);
-                            q = null;
-                            letter = !letter;
-                        }
-                        if (q == null)
-                        {
-                            q = Utils.Clone(charQuads[i]);
-                        }
-                        else // check distance between quads - if we can concat them or not
+                        for (int i = 0; i < text.Length; ++i)
                         {
-                            const double interval = 0.5;
-                            if (q.BottomRight.H + interval < charQuads[i].BottomLeft.H)
+                            if (char.IsLetter(text, i) != letter)
+                            {
+                                if (q != null) quads.Add(q);
+                                q = null;
+                                letter = !letter;
+                            }
+                            if (q == null)
                             {
-                                quads.Add(q);
                                 q = Utils.Clone(charQuads[i]);
                             }
-                            else
+                            else // check distance between quads - if we can concat them or not
                             {
-                                q = Concat(q, charQuads[i]);
+                                const double interval = 0.5;
+                                if (q.BottomRight.H + interval < charQuads[i].BottomLeft.H)
+                                {
+                                    quads.Add(q);
+                                    q = Utils.Clone(charQuads[i]);
+                                }
+                                else
+                                {
+                                    q = Concat(q, charQuads[i]);
+                                }
                             }
                         }
                     }
-                    if (q != null) quads.Add(q);
+                        if (q != null) quads.Add(q);
                 }
             }
             if (quads.Count > 0) return quads;

DocumentConversion/ZUGFeRDConverter/ZUGFeRDConverter.csproj

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{7e090b4f-0db4-4c40-a48a-40c0111019d5}</ProjectGuid>
+    <ProjectGuid>{7CA392CB-AFD3-4BD8-B3B5-C634A8A51F74}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>ZUGFeRDConverter</RootNamespace>
     <AssemblyName>ZUGFeRDConverter</AssemblyName>
@@ -56,4 +56,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

Images/ImageImport/ImageImport.cs

@@ -5,11 +5,9 @@
 
 /*
  * 
- * This program demonstrates how to import images into a PDF file. The program runs without
- * prompting you, and creates two PDF files, demonstrating how to import graphics from image files
- * into a PDF file. One of the PDF output files is the result of graphics imported from a multi-page TIF file.
+ * This sample demonstrates how to import an image into a PDF file.
  * 
- * Copyright (c) 2007-2023, Datalogics, Inc. All rights reserved.
+ * Copyright (c) 2007-2025, Datalogics, Inc. All rights reserved.
  *
  */
 

OpticalCharacterRecognition/AddTextToImage/AddTextToImage.csproj

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{a1a2f184-6250-4843-8d6b-3a72776dd27d}</ProjectGuid>
+    <ProjectGuid>{7B949A55-4748-4B93-A9D7-AE6555648A79}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>AddTextToImage</RootNamespace>
     <AssemblyName>AddTextToImage</AssemblyName>