[[ RefactorGraphics ]] add MCContextCopyImage function

livecodeian · livecodeian · commit f5bd0ad63c57 · 2013-07-04T13:40:55.000+01:00
diff --git a/libgraphics/include/graphics.h b/libgraphics/include/graphics.h
@@ -439,6 +439,8 @@ void MCGContextDrawRectOfImage(MCGContextRef self, MCGImageRef p_image, MCGRecta
 void MCGContextDrawText(MCGContextRef context, const char* text, uindex_t length, MCGPoint location, uint32_t font_size);
 MCGFloat MCGContextMeasureText(MCGContextRef context, const char *text, uindex_t length, uint32_t font_size);
 
+bool MCGContextCopyImage(MCGContextRef context, MCGImageRef &r_image);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Transforms
diff --git a/libgraphics/src/context.cpp b/libgraphics/src/context.cpp
@@ -2,6 +2,7 @@
 #include "graphics-internal.h"
 
 #include <SkCanvas.h>
+#include <SkDevice.h>
 #include <SkPaint.h>
 #include <SkBitmap.h>
 #include <SkShader.h>
@@ -215,7 +216,7 @@ bool MCGContextCreate(uint32_t p_width, uint32_t p_height, bool p_alpha, MCGCont
 	t_bitmap . setConfig(SkBitmap::kARGB_8888_Config, p_width, p_height);
 	t_bitmap . setIsOpaque(!p_alpha);
 	
-	if (t_bitmap . allocPixels())	
+	if (t_bitmap . allocPixels())
 		return MCGContextCreateWithBitmap(t_bitmap, r_context);
 	else
 		return false;
@@ -1407,4 +1408,14 @@ MCGFloat MCGContextMeasureText(MCGContextRef self, const char *p_text, uindex_t
 	return t_width;
 }
 
-////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+bool MCGContextCopyImage(MCGContextRef self, MCGImageRef &r_image)
+{
+	if (!MCGContextIsValid(self))
+		return false;
+	
+	return MCGImageCreateWithSkBitmap(self->canvas->getDevice()->accessBitmap(false), r_image);
+}
+
+////////////////////////////////////////////////////////////////////////////////
diff --git a/libgraphics/src/graphics-internal.h b/libgraphics/src/graphics-internal.h
@@ -368,4 +368,8 @@ inline MCGRasterFormat MCGRasterFormatFromSkBitmapConfig(SkBitmap::Config p_conf
 
 ////////////////////////////////////////////////////////////////////////////////
 
+bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image);
+
+////////////////////////////////////////////////////////////////////////////////
+
 #endif
diff --git a/libgraphics/src/image.cpp b/libgraphics/src/image.cpp
@@ -13,26 +13,24 @@ static void MCGImageDestroy(MCGImageRef self)
 	}
 }
 
-bool __MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGImageRef &r_image, MCGPixelOwnershipType p_ownership)
+bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)
 {
 	bool t_success;
 	t_success = true;
 	
 	__MCGImage *t_image;
-	t_image = NULL;
+	t_image = nil;
 	if (t_success)
 		t_success = MCMemoryNew(t_image);
 	
 	SkBitmap *t_bitmap;
+	t_bitmap = nil;
 	if (t_success)
 	{
-		t_bitmap = new SkBitmap();
-		t_success = t_bitmap != NULL;
+		t_bitmap = new SkBitmap(p_bitmap);
+		t_success = nil != t_bitmap;
 	}
 	
-	if (t_success)
-		t_success = MCGRasterToSkBitmap(p_raster, p_ownership, *t_bitmap);
-	
 	if (t_success)
 	{
 		t_image -> bitmap = t_bitmap;
@@ -42,27 +40,51 @@ bool __MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGImageRef &r_image,
 	}
 	else
 	{
-		if (t_bitmap != NULL)
+		if (t_bitmap != nil)
 			delete t_bitmap;
 		MCMemoryDelete(t_image);
-	}	
+	}
+	
+	return t_success;
+}
+
+bool MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGPixelOwnershipType p_ownership, MCGImageRef &r_image)
+{
+	bool t_success;
+	t_success = true;
+	
+	__MCGImage *t_image;
+	t_image = nil;
+	
+	SkBitmap t_bitmap;
+	
+	if (t_success)
+		t_success = MCGRasterToSkBitmap(p_raster, p_ownership, t_bitmap);
+	
+	if (t_success)
+		t_success = MCGImageCreateWithSkBitmap(t_bitmap, t_image);
+	
+	if (t_success)
+		r_image = t_image;
+	else
+		MCMemoryDelete(t_image);
 	
 	return t_success;	
 }
 
 bool MCGImageCreateWithRasterAndRelease(const MCGRaster &p_raster, MCGImageRef &r_image)
 {
-	return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeTake);
+	return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeTake, r_image);
 }
 
 bool MCGImageCreateWithRasterNoCopy(const MCGRaster& p_raster, MCGImageRef& r_image)
 {
-	return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeBorrow);
+	return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeBorrow, r_image);
 }
 
 bool MCGImageCreateWithRaster(const MCGRaster& p_raster, MCGImageRef& r_image)
 {
-	return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeCopy);
+	return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeCopy, r_image);
 }
 
 bool MCGImageGetRaster(MCGImageRef p_image, MCGRaster &r_raster)

Original file line number	Diff line number	Diff line change
`@@ -13,26 +13,24 @@ static void MCGImageDestroy(MCGImageRef self)`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-bool __MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGImageRef &r_image, MCGPixelOwnershipType p_ownership)`
	`16`	`+bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)`
`17`	`17`	`{`
`18`	`18`	`bool t_success;`
`19`	`19`	`t_success = true;`
`20`	`20`
`21`	`21`	`__MCGImage *t_image;`
`22`		`- t_image = NULL;`
	`22`	`+ t_image = nil;`
`23`	`23`	`if (t_success)`
`24`	`24`	`t_success = MCMemoryNew(t_image);`
`25`	`25`
`26`	`26`	`SkBitmap *t_bitmap;`
	`27`	`+ t_bitmap = nil;`
`27`	`28`	`if (t_success)`
`28`	`29`	`{`
`29`		`- t_bitmap = new SkBitmap();`
`30`		`- t_success = t_bitmap != NULL;`
	`30`	`+ t_bitmap = new SkBitmap(p_bitmap);`
	`31`	`+ t_success = nil != t_bitmap;`
`31`	`32`	`}`
`32`	`33`
`33`		`- if (t_success)`
`34`		`- t_success = MCGRasterToSkBitmap(p_raster, p_ownership, *t_bitmap);`
`35`		`-`
`36`	`34`	`if (t_success)`
`37`	`35`	`{`
`38`	`36`	`t_image -> bitmap = t_bitmap;`
`@@ -42,27 +40,51 @@ bool __MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGImageRef &r_image,`
`42`	`40`	`}`
`43`	`41`	`else`
`44`	`42`	`{`
`45`		`- if (t_bitmap != NULL)`
	`43`	`+ if (t_bitmap != nil)`
`46`	`44`	`delete t_bitmap;`
`47`	`45`	`MCMemoryDelete(t_image);`
`48`		`- }`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ return t_success;`
	`49`	`+}`
	`50`	`+`
	`51`	`+bool MCGImageCreateWithRaster(const MCGRaster &p_raster, MCGPixelOwnershipType p_ownership, MCGImageRef &r_image)`
	`52`	`+{`
	`53`	`+ bool t_success;`
	`54`	`+ t_success = true;`
	`55`	`+`
	`56`	`+ __MCGImage *t_image;`
	`57`	`+ t_image = nil;`
	`58`	`+`
	`59`	`+ SkBitmap t_bitmap;`
	`60`	`+`
	`61`	`+ if (t_success)`
	`62`	`+ t_success = MCGRasterToSkBitmap(p_raster, p_ownership, t_bitmap);`
	`63`	`+`
	`64`	`+ if (t_success)`
	`65`	`+ t_success = MCGImageCreateWithSkBitmap(t_bitmap, t_image);`
	`66`	`+`
	`67`	`+ if (t_success)`
	`68`	`+ r_image = t_image;`
	`69`	`+ else`
	`70`	`+ MCMemoryDelete(t_image);`
`49`	`71`
`50`	`72`	`return t_success;`
`51`	`73`	`}`
`52`	`74`
`53`	`75`	`bool MCGImageCreateWithRasterAndRelease(const MCGRaster &p_raster, MCGImageRef &r_image)`
`54`	`76`	`{`
`55`		`- return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeTake);`
	`77`	`+ return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeTake, r_image);`
`56`	`78`	`}`
`57`	`79`
`58`	`80`	`bool MCGImageCreateWithRasterNoCopy(const MCGRaster& p_raster, MCGImageRef& r_image)`
`59`	`81`	`{`
`60`		`- return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeBorrow);`
	`82`	`+ return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeBorrow, r_image);`
`61`	`83`	`}`
`62`	`84`
`63`	`85`	`bool MCGImageCreateWithRaster(const MCGRaster& p_raster, MCGImageRef& r_image)`
`64`	`86`	`{`
`65`		`- return __MCGImageCreateWithRaster(p_raster, r_image, kMCGPixelOwnershipTypeCopy);`
	`87`	`+ return MCGImageCreateWithRaster(p_raster, kMCGPixelOwnershipTypeCopy, r_image);`
`66`	`88`	`}`
`67`	`89`
`68`	`90`	`bool MCGImageGetRaster(MCGImageRef p_image, MCGRaster &r_raster)`