The C++ now compiles

diff --git a/include/c/sk_bitmap.h b/include/c/sk_bitmap.h
index 6016752..5934b57 100644 (file)
--- a/include/c/sk_bitmap.h
+++ b/include/c/sk_bitmap.h
@@ -37,10 +37,6 @@ SK_C_API sk_color_t sk_bitmap_get_pixel_color(sk_bitmap_t* cbitmap, int x, int y
 SK_C_API sk_pmcolor_t sk_bitmap_get_index8_color(sk_bitmap_t* cbitmap, int x, int y);
 SK_C_API void sk_bitmap_set_pixel_color(sk_bitmap_t* cbitmap, int x, int y, sk_color_t color);
 SK_C_API bool sk_bitmap_ready_to_draw(sk_bitmap_t* cbitmap);
-SK_C_API bool sk_bitmap_copy(sk_bitmap_t* cbitmap, sk_bitmap_t* dst, sk_colortype_t ct);
-SK_C_API bool sk_bitmap_can_copy_to(sk_bitmap_t* cbitmap, sk_colortype_t ct);
-SK_C_API void sk_bitmap_lock_pixels(sk_bitmap_t* cbitmap);
-SK_C_API void sk_bitmap_unlock_pixels(sk_bitmap_t* cbitmap);
 SK_C_API void sk_bitmap_get_pixel_colors(sk_bitmap_t* cbitmap, sk_color_t* colors);
 SK_C_API void sk_bitmap_set_pixel_colors(sk_bitmap_t* cbitmap, const sk_color_t* colors);
 SK_C_API bool sk_bitmap_install_pixels(sk_bitmap_t* cbitmap, const sk_imageinfo_t* cinfo, void* pixels, size_t rowBytes, sk_colortable_t* ctable, const sk_bitmap_release_proc releaseProc, void* context);

diff --git a/include/c/sk_types.h b/include/c/sk_types.h
index c1caf3a..a984805 100644 (file)
--- a/include/c/sk_types.h
+++ b/include/c/sk_types.h
@@ -640,7 +640,6 @@ typedef enum {
     SRGBA_8888_GR_PIXEL_CONFIG,
     SBGRA_8888_GR_PIXEL_CONFIG,
     RGBA_8888_SINT_GR_PIXEL_CONFIG,
-    ETC1_GR_PIXEL_CONFIG,
     RGBA_FLOAT_GR_PIXEL_CONFIG,
     RG_FLOAT_GR_PIXEL_CONFIG,
     ALPHA_HALF_GR_PIXEL_CONFIG,
@@ -719,8 +718,6 @@ typedef struct {
     int  fBufferMapThreshold;
     bool fUseDrawInsteadOfPartialRenderTargetWrite;
     bool fImmediateMode;
-    int fMaxOpCombineLookback;
-    int fMaxOpCombineLookahead;
     bool fUseShaderSwizzling;
     bool fDoManualMipmapping;
     bool fEnableInstancedRendering;
@@ -728,7 +725,9 @@ typedef struct {
     bool fRequireDecodeDisableForSRGB;
     bool fDisableGpuYUVConversion;
     bool fSuppressPathRendering;
+    bool fWireframeMode;
     gr_contextoptions_gpupathrenderers_t fGpuPathRenderers;
+    float fGlyphCacheTextureMaximumBytes;
     bool fAvoidStencilBuffers;
 } gr_context_options_t;
 

diff --git a/src/c/sk_bitmap.cpp b/src/c/sk_bitmap.cpp
index 0eb0ac4..4cf7654 100644 (file)
--- a/src/c/sk_bitmap.cpp
+++ b/src/c/sk_bitmap.cpp
@@ -208,8 +208,6 @@ void sk_bitmap_set_pixel_color(sk_bitmap_t* cbitmap, int x, int y, sk_color_t co
 {
     SkBitmap* bmp = AsBitmap(cbitmap);
 
-    SkAutoLockPixels alp(*bmp);
-
     switch (bmp->colorType()) {
     case kAlpha_8_SkColorType:
         copyAlpha8FromColor(1, &color, (uint8_t*)bmp->getAddr8(x, y));
@@ -234,32 +232,10 @@ bool sk_bitmap_ready_to_draw(sk_bitmap_t* cbitmap)
     return AsBitmap(cbitmap)->readyToDraw();
 }
 
-bool sk_bitmap_copy(sk_bitmap_t* cbitmap, sk_bitmap_t* dst, sk_colortype_t ct)
-{
-    return AsBitmap(cbitmap)->copyTo(AsBitmap(dst), (SkColorType)ct);
-}
-
-bool sk_bitmap_can_copy_to(sk_bitmap_t* cbitmap, sk_colortype_t ct)
-{
-    return AsBitmap(cbitmap)->canCopyTo((SkColorType)ct);
-}
-
-void sk_bitmap_unlock_pixels(sk_bitmap_t* cbitmap)
-{
-    AsBitmap(cbitmap)->unlockPixels();
-}
-
-void sk_bitmap_lock_pixels(sk_bitmap_t* cbitmap)
-{
-    AsBitmap(cbitmap)->lockPixels();
-}
-
 void sk_bitmap_get_pixel_colors(sk_bitmap_t* cbitmap, sk_color_t* colors)
 {
     SkBitmap* bmp = AsBitmap(cbitmap);
 
-    SkAutoLockPixels alp(*bmp);
-
     size_t size = bmp->height() * bmp->width();
     const void* pixels = bmp->getPixels();
 
@@ -289,8 +265,6 @@ void sk_bitmap_set_pixel_colors(sk_bitmap_t* cbitmap, const sk_color_t* colors)
 {
     SkBitmap* bmp = AsBitmap(cbitmap);
 
-    SkAutoLockPixels alp(*bmp);
-
     size_t width = bmp->width();
     size_t height = bmp->height();
     size_t size = height * width;

diff --git a/src/c/sk_enums.cpp b/src/c/sk_enums.cpp
index 40c7c25..42cb866 100644 (file)
--- a/src/c/sk_enums.cpp
+++ b/src/c/sk_enums.cpp
@@ -378,7 +378,6 @@ static_assert ((int)GrPixelConfig::kBGRA_8888_GrPixelConfig        == (int)BGRA_
 static_assert ((int)GrPixelConfig::kSRGBA_8888_GrPixelConfig       == (int)SRGBA_8888_GR_PIXEL_CONFIG,       ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
 static_assert ((int)GrPixelConfig::kSBGRA_8888_GrPixelConfig       == (int)SBGRA_8888_GR_PIXEL_CONFIG,       ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
 static_assert ((int)GrPixelConfig::kRGBA_8888_sint_GrPixelConfig   == (int)RGBA_8888_SINT_GR_PIXEL_CONFIG,   ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
-static_assert ((int)GrPixelConfig::kETC1_GrPixelConfig             == (int)ETC1_GR_PIXEL_CONFIG,             ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
 static_assert ((int)GrPixelConfig::kRGBA_float_GrPixelConfig       == (int)RGBA_FLOAT_GR_PIXEL_CONFIG,       ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
 static_assert ((int)GrPixelConfig::kRG_float_GrPixelConfig         == (int)RG_FLOAT_GR_PIXEL_CONFIG,         ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));
 static_assert ((int)GrPixelConfig::kAlpha_half_GrPixelConfig       == (int)ALPHA_HALF_GR_PIXEL_CONFIG,       ASSERT_MSG(GrPixelConfig, gr_pixelconfig_t));

diff --git a/src/c/sk_types_priv.h b/src/c/sk_types_priv.h
index 99c2a7b..87df9ab 100644 (file)
--- a/src/c/sk_types_priv.h
+++ b/src/c/sk_types_priv.h
@@ -9,6 +9,9 @@
 #define sk_types_priv_DEFINED
 
 #include "SkImageInfo.h"
+#include "SkCanvas.h"
+#include "SkSurface.h"
+#include "SkVertices.h"
 #include "SkBlurTypes.h"
 #include "SkDocument.h"
 #include "SkPaint.h"