Merge branch 'bitmap_allocator_pixelref' into id_change_listener

# Conflicts: # include/xamarin/sk_managedpixelref.h # src/xamarin/sk_managedpixelref.cpp
mono · Jul 9, 2022 · fd2eeb9 · fd2eeb9
2 parents 7003f97 + 9a7aedc
commit fd2eeb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/include/c/sk_types.h b/include/c/sk_types.h
@@ -343,12 +343,15 @@ typedef struct sk_string_t sk_string_t;
     A sk_bitmap_t is an abstraction that specifies a raster bitmap.
 */
 typedef struct sk_bitmap_t sk_bitmap_t;
+typedef struct sk_bitmapallocator_t sk_bitmapallocator_t;
 typedef struct sk_pixmap_t sk_pixmap_t;
 // placed here to help seperate in PR
 typedef struct sk_png_chunk_reader_t sk_png_chunk_reader_t;
 // placed here to help seperate in PR
 typedef struct sk_pixelref_t sk_pixelref_t;
 typedef struct sk_colorfilter_t sk_colorfilter_t;
+// placed here to help seperate in PR
+typedef struct sk_pixelref_t sk_pixelref_t;
 typedef struct sk_imagefilter_t sk_imagefilter_t;
 typedef struct sk_imagefilter_croprect_t sk_imagefilter_croprect_t;
 

diff --git a/src/xamarin/SkiaKeeper.c b/src/xamarin/SkiaKeeper.c
@@ -52,6 +52,9 @@
 
 // Xamarin
 #include "include/xamarin/sk_managedstream.h"
+// placed here to help seperate in PR
+#include "include/xamarin/sk_managedallocator.h"
+#include "include/xamarin/sk_managedpixelref.h"
 #include "include/xamarin/sk_manageddrawable.h"
 #include "include/xamarin/sk_managedpngchunkreader.h"
 #include "include/xamarin/sk_managedallocator.h"
@@ -114,6 +117,10 @@ void** KeepSkiaCSymbols (void)
         // Xamarin
         (void*)sk_compatpaint_new,
         (void*)sk_managedstream_new,
+        // placed here to help seperate in PR
+        (void*)sk_managedallocator_new,
+        (void*)sk_managedpixelref_new,
+        (void*)sk_managedpixelref_new_from_existing,
         (void*)sk_manageddrawable_new,
         (void*)sk_managedpngchunkreader_new,
         (void*)sk_managedallocator_new,