From 0206cd3cd64ca26598b4c0718d70acb0b71b9c03 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Thu, 7 Dec 2017 17:22:43 +0100 Subject: [PATCH] Use []byte instead of unsafe.Pointer --- raylib/textures.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/raylib/textures.go b/raylib/textures.go index 67e8d8f..c5545b7 100644 --- a/raylib/textures.go +++ b/raylib/textures.go @@ -112,7 +112,7 @@ func (i *Image) ToImage() image.Image { // Get pixel data from image (RGBA 32bit) pixels := GetImageData(i) - img.Pix = (*[1 << 30]uint8)(pixels)[:] + img.Pix = pixels return img } @@ -284,10 +284,10 @@ func UnloadRenderTexture(target RenderTexture2D) { } // GetImageData - Get pixel data from image -func GetImageData(image *Image) unsafe.Pointer { +func GetImageData(image *Image) []byte { cimage := image.cptr() ret := C.GetImageData(*cimage) - return unsafe.Pointer(ret) + return (*[1 << 30]uint8)(unsafe.Pointer(ret))[:] } // GetTextureData - Get pixel data from GPU texture and return an Image @@ -299,9 +299,9 @@ func GetTextureData(texture Texture2D) *Image { } // UpdateTexture - Update GPU texture with new data -func UpdateTexture(texture Texture2D, pixels unsafe.Pointer) { +func UpdateTexture(texture Texture2D, pixels []byte) { ctexture := texture.cptr() - cpixels := (unsafe.Pointer)(unsafe.Pointer(pixels)) + cpixels := unsafe.Pointer(&pixels[0]) C.UpdateTexture(*ctexture, cpixels) }