ComPDFKit(win) - 移除SetInkRect接口,补充音频注释设置音频文件的图片

Demo/Examples/Samples/AnnotationTest/CS/AnnotationTest.cs

@@ -98,8 +98,6 @@ namespace AnnotationTest
                 new CPoint(100,10),
             });
             ink.SetInkPath(points);
-            ink.SetInkRect(new CRect(10, 200, 200, 10));
-
             ink.UpdateAp();
         }
 
@@ -171,7 +169,12 @@ namespace AnnotationTest
             CPDFPage page = document.PageAtIndex(1);
             CPDFSoundAnnotation sound = page.CreateAnnot(C_ANNOTATION_TYPE.C_ANNOTATION_SOUND) as CPDFSoundAnnotation;
             sound.SetRect(new CRect(400, 750, 450, 700));
-            sound.SetSoundPath(null,"Bird.wav");
+
+            using (var image = new MagickImage("SoundAnnot.png"))
+            {
+                byte[] byteArray = image.ToByteArray(MagickFormat.Bgra);
+                sound.SetSoundPath(byteArray, image.Width, image.Height, "Bird.wav");
+            }
             sound.UpdateAp();
         }
 

Demo/Examples/Samples/AnnotationTest/CS/AnnotationTest.csproj

@@ -50,14 +50,17 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.Desk</Name>
-    </ProjectReference>
+      <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows_core\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj" />
   </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" />
+      <Content Include="SoundAnnot.png">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
     </ItemGroup>
 
 </Project>

Demo/Examples/Samples/AnnotationTest/VB/AnnotationTest.vb

@@ -77,8 +77,6 @@ Module AnnotationTest
     })
 
         ink.SetInkPath(points)
-        ink.SetInkRect(New CRect(10, 200, 200, 10))
-
         ink.UpdateAp()
     End Sub
 
@@ -128,11 +126,13 @@ Module AnnotationTest
         textAnnotation.SetRect(New CRect(300, 650, 350, 600))
         textAnnotation.UpdateAp()
     End Sub
+
     Private Sub CreateSoundAnnotation(document As CPDFDocument)
         Dim page As CPDFPage = document.PageAtIndex(0)
         Dim sound As CPDFSoundAnnotation = TryCast(page.CreateAnnot(C_ANNOTATION_TYPE.C_ANNOTATION_SOUND), CPDFSoundAnnotation)
         sound.SetRect(New CRect(400, 750, 450, 700))
-        sound.SetSoundPath("","Bird.wav")
+        Dim bitmap As New Bitmap("SoundAnnot.png")
+        sound.SetSoundPath(BitmapToByteArray(bitmap), bitmap.Width, bitmap.Height, "Bird.wav")
         sound.UpdateAp()
     End Sub
 

Demo/Examples/Samples/AnnotationTest/VB/AnnotationTest.vbproj

@@ -129,10 +129,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\TestFile\logo.png">
+    <Content Include="..\..\..\TestFile\logo.png">
       <Link>logo.png</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\license_key_windows.xml">
@@ -141,9 +141,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <Content Include="SoundAnnot.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows_core\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.Desk</Name>
+      <Name>ComPDFKit.NET</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>