update from remote

diff --cc include/c/sk_bitmap.h
index 0e6175a,7bf6c4a..9c9256d
--- 1/include/c/sk_bitmap.h
--- 2/include/c/sk_bitmap.h
+++ b/include/c/sk_bitmap.h
@@@ -42,7 -41,7 +42,8 @@@ SK_API void sk_bitmap_set_pixel_colors(
  SK_API bool sk_bitmap_try_alloc_pixels(sk_bitmap_t* cbitmap, const sk_imageinfo_t* requestedInfo, size_t rowBytes);
  SK_API bool sk_bitmap_try_alloc_pixels_with_color_table(sk_bitmap_t* cbitmap, const sk_imageinfo_t* requestedInfo, sk_pixelref_factory_t* factory, sk_colortable_t* ctable);
  SK_API sk_colortable_t* sk_bitmap_get_colortable(sk_bitmap_t* cbitmap);
- SK_API bool sk_bitmap_set_colortable(sk_colortable_t* ctable);
 -SK_API void sk_bitmap_set_colortable(sk_bitmap_t* cbitmap, sk_colortable_t* ctable);
++SK_API void sk_bitmap_set_pixels(sk_bitmap_t* cbitmap, const void* pixels, sk_colortable_t* ctable);
++
  
  SK_C_PLUS_PLUS_END_GUARD
  

diff --cc src/c/sk_bitmap.cpp
index f29b190,4a75ed8..ad0c0c4
--- 1/src/c/sk_bitmap.cpp
--- 2/src/c/sk_bitmap.cpp
+++ b/src/c/sk_bitmap.cpp
@@@ -321,8 -315,8 +321,8 @@@ sk_colortable_t* sk_bitmap_get_colortab
      return ToColorTable(AsBitmap(cbitmap)->getColorTable());
  }
  
- void sk_bitmap_set_colortable(sk_bitmap_t* cbitmap, sk_colortable_t* ctable)
+ void sk_bitmap_set_pixels(sk_bitmap_t* cbitmap, const void* pixels, sk_colortable_t* ctable)
  {
-     SkBitmap* bmp = AsBitmap(cbitmap);
-     bmp->setPixels(bmp->getPixels(), AsColorTable(ctable));
+     SkBitmap* bmp AsBitmap(cbitmap);
+     bmp->setPixels(pixels, AsColorTable(ctable));
 -}
 +}