gabehf/talgo-libwebp
1
0
Fork 0
mirror of https://github.com/talgo-cloud/talgo-libwebp.git synced 2026-03-07 21:48:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to adopt cgo pointer rules in EncodeYUVA and EncodeGray.

Browse source 
This changes will fix these errors:

- "cgo argument has Go pointer to Go pointer" in EncodeYUVA
- "Go pointer stored into non-Go memory" in EncodeYUVA and EncodeGray
This commit is contained in:
Shunsuke Michii 2017-03-29 18:00:32 +09:00
parent 8e7242c458
commit 8a2921d35f
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
webp/encode.go
View file

@ -15,7 +15,19 @@ static void free_WebPPicture(WebPPicture* webpPicture) {
free(webpPicture); free(webpPicture);
} }
static int webpEncodeGray(const WebPConfig *config, WebPPicture *picture) { static int webpEncodeYUVA(const WebPConfig *config, WebPPicture *picture, uint8_t *y, uint8_t *u, uint8_t *v, uint8_t *a) {
picture->y = y;
picture->u = u;
picture->v = v;
if (picture->colorspace = WEBP_YUV420A) {
picture->a = a;
}
picture->writer = (WebPWriterFunction)writeWebP;
return WebPEncode(config, picture);
}
static int webpEncodeGray(const WebPConfig *config, WebPPicture *picture, uint8_t *y) {
int ok = 0; int ok = 0;
const int c_width = (picture->width + 1) >> 1; const int c_width = (picture->width + 1) >> 1;
const int c_height = (picture->height + 1) >> 1; const int c_height = (picture->height + 1) >> 1;
@ -30,9 +42,11 @@ static int webpEncodeGray(const WebPConfig *config, WebPPicture *picture) {
} }
memset(chroma, gray, c_size); memset(chroma, gray, c_size);
picture->y = y;
picture->u = chroma; picture->u = chroma;
picture->v = chroma; picture->v = chroma;
picture->uv_stride = c_stride; picture->uv_stride = c_stride;
picture->writer = (WebPWriterFunction)writeWebP;
ok = WebPEncode(config, picture); ok = WebPEncode(config, picture);
@ -506,12 +520,9 @@ func EncodeGray(w io.Writer, p *image.Gray, c *Config) (err error) {
pic.use_argb = 0 pic.use_argb = 0
pic.width = C.int(p.Rect.Dx()) pic.width = C.int(p.Rect.Dx())
pic.height = C.int(p.Rect.Dy()) pic.height = C.int(p.Rect.Dy())
pic.y = (*C.uint8_t)(&p.Pix[0])
pic.y_stride = C.int(p.Stride) pic.y_stride = C.int(p.Stride)
pic.writer = C.WebPWriterFunction(C.writeWebP) if C.webpEncodeGray(&c.c, pic, (*C.uint8_t)(&p.Pix[0])) == 0 {
if C.webpEncodeGray(&c.c, pic) == 0 {
return fmt.Errorf("Encoding error: %d", pic.error_code) return fmt.Errorf("Encoding error: %d", pic.error_code)
} }
@ -542,24 +553,18 @@ func EncodeYUVA(w io.Writer, img *YUVAImage, c *Config) (err error) {
pic.colorspace = C.WebPEncCSP(img.ColorSpace) pic.colorspace = C.WebPEncCSP(img.ColorSpace)
pic.width = C.int(img.Rect.Dx()) pic.width = C.int(img.Rect.Dx())
pic.height = C.int(img.Rect.Dy()) pic.height = C.int(img.Rect.Dy())
pic.y = (*C.uint8_t)(&img.Y[0])
pic.u = (*C.uint8_t)(&img.Cb[0])
pic.v = (*C.uint8_t)(&img.Cr[0])
pic.y_stride = C.int(img.YStride) pic.y_stride = C.int(img.YStride)
pic.uv_stride = C.int(img.CStride) pic.uv_stride = C.int(img.CStride)
var a *C.uint8_t
y, u, v := (*C.uint8_t)(&img.Y[0]), (*C.uint8_t)(&img.Cb[0]), (*C.uint8_t)(&img.Cr[0])
if img.ColorSpace == YUV420A { if img.ColorSpace == YUV420A {
pic.a = (*C.uint8_t)(&img.A[0])
pic.a_stride = C.int(img.AStride) pic.a_stride = C.int(img.AStride)
a = (*C.uint8_t)(&img.A[0])
} }
pic.writer = C.WebPWriterFunction(C.writeWebP) if C.webpEncodeYUVA(&c.c, pic, y, u, v, a) == 0 {
pic.custom_ptr = unsafe.Pointer(&destinationManager{writer: w})
if C.WebPEncode(&c.c, pic) == 0 {
return fmt.Errorf("Encoding error: %d", pic.error_code) return fmt.Errorf("Encoding error: %d", pic.error_code)
} }
return return
} }