FEAT: GOB to image conversion on Windows -> to-image make gob! []

Author: Oldes

src/core/t-image.c

@@ -1034,9 +1034,14 @@ INLINE REBCNT ARGB_To_BGR(REBCNT i)
 	case A_TO:
 		if (IS_IMAGE(arg)) goto makeCopy;
 		else if (IS_GOB(arg)) {
+			//originally it was returning image without content when conversion failed!
 			//value = Make_Image(ROUND_TO_INT(GOB_W(VAL_GOB(arg))), ROUND_TO_INT(GOB_H(VAL_GOB(arg))));
-			//*D_RET = *value;
+#ifndef TO_WINDOWS
+			//TODO: remove this once OS_GOB_TO_IMAGE will be for all systems
+			Trap0(RE_FEATURE_NA);
+#else
 			series = OS_GOB_TO_IMAGE(VAL_GOB(arg));
+#endif
 			if (!series) Trap_Make(REB_IMAGE, arg);
 			SET_IMAGE(value, series);
 			break;

src/include/reb-compositor.h

@@ -42,7 +42,7 @@ typedef struct rebol_compositor_ctx {
 	REBGOB    *root_gob;
 	REBGOB    *wind_gob;
 	REBXYI     wind_size;
-	//REBYTE    *wind_buffer; // was used for AGG
+	REBYTE    *wind_buffer; // can be used for conversion to image; was also used with AGG
 	#ifdef TO_WINDOWS
 		HDC        wind_DC;
 		HBITMAP    back_buffer;

src/os/win32/host-compositor.c

@@ -121,6 +121,34 @@ static REBXYF Zero_Pair = {0, 0};
 }
 
 
+/***********************************************************************
+**
+*/ REBYTE* OS_Get_Window_Buffer(REBCMP* ctx)
+/*
+**	Provide pointer to window compositing buffer.
+**  Return NULL if buffer not available of call failed.
+**
+**  NOTE: The buffer may be "locked" during this call on some platforms.
+**        Always call Os_Release_Window_Buffer(ctx) to be sure it is released.
+**
+***********************************************************************/
+{
+	return ctx->wind_buffer;
+}
+
+/***********************************************************************
+**
+*/ void OS_Release_Window_Buffer(REBCMP* ctx)
+/*
+**	Release the window compositing buffer acquired by Os_Get_Window_Buffer().
+**
+**  NOTE: this call can be "no-op" on platforms that don't need locking.
+**
+***********************************************************************/
+{
+}
+
+
 /***********************************************************************
 **
 */ REBOOL OS_Resize_Window_Buffer(REBCMP* ctx, REBGOB* winGob)
@@ -179,7 +207,7 @@ static REBXYF Zero_Pair = {0, 0};
 		//make the new buffer actual
 		ctx->back_buffer = new_buffer;
 		ctx->back_DC = new_DC;
-		//ctx->wind_buffer = new_bytes;
+		ctx->wind_buffer = new_bytes;
 
 		//set window clip region
 //		SetRectRgn(ctx->win_clip, 0, 0, w, h);
@@ -383,6 +411,36 @@ static REBXYF Zero_Pair = {0, 0};
 	GOB_HO(gob) = GOB_LOG_H(gob);
 }
 
+
+/***********************************************************************
+**
+*/  REBSER* OS_Gob_To_Image(REBGOB *gob)
+/*
+**		Render gob into an image.
+**
+***********************************************************************/
+{
+	REBINT w, h;
+	REBSER *img;
+	REBCMP *cmp;
+
+	w = GOB_LOG_W_INT(gob);
+	h = GOB_LOG_H_INT(gob);
+	img = (REBSER*)RL_MAKE_IMAGE(w, h);
+
+	cmp = OS_Create_Compositor(Gob_Root, gob);
+	OS_Compose_Gob(cmp, gob, gob, TRUE);
+
+	//copy the composed result to image
+	memcpy((REBYTE *)RL_SERIES(img, RXI_SER_DATA), OS_Get_Window_Buffer(cmp), w * h * 4);
+
+	OS_Release_Window_Buffer(cmp);
+	OS_Destroy_Compositor(cmp);
+
+	return img;
+}
+
+
 /***********************************************************************
 **
 */ void OS_Blit_Window(REBCMP* ctx)
@@ -466,31 +524,3 @@ static REBXYF Zero_Pair = {0, 0};
 }
 
 
-#ifdef UNUSED_OLD_COMPOSITOR_CODE
-/***********************************************************************
-**
-*/ REBYTE* rebcmp_get_buffer(REBCMP* ctx)
-/*
-**	Provide pointer to window compositing buffer.
-**  Return NULL if buffer not available of call failed.
-**
-**  NOTE: The buffer may be "locked" during this call on some platforms.
-**        Always call rebcmp_release_buffer() to be sure it is released.
-**
-***********************************************************************/
-{
-	return ctx->wind_buffer;
-}
-
-/***********************************************************************
-**
-*/ void rebcmp_release_buffer(REBCMP* ctx)
-/*
-**	Release the window compositing buffer acquired by rebcmp_get_buffer().
-**
-**  NOTE: this call can be "no-op" on platforms that don't need locking.
-**
-***********************************************************************/
-{
-}
-#endif

src/os/win32/host-lib.c

@@ -1319,27 +1319,3 @@ static void *Task_Ready;
 	return ret;
 }
 
-
-/***********************************************************************
-**
-*/	REBSER *OS_GOB_To_Image(REBGOB *gob)
-/*
-**		Render a GOB into an image. Returns an image or zero if
-**		it cannot be done.
-**
-***********************************************************************/
-{
-
-#ifndef REB_CORE
-
-#ifndef NO_COMPOSITOR
-	return (REBSER*)Gob_To_Image(gob);
-#else
-	return 0;
-#endif
-
-#else
-	return 0;
-#endif
-
-}