34 lines
1.1 KiB
Plaintext
34 lines
1.1 KiB
Plaintext
$OpenBSD: patch-src_image_c,v 1.4 2015/03/28 16:06:48 sthen Exp $
|
|
|
|
Fix build with giflib-5.1
|
|
|
|
--- src/image.c.orig Wed Dec 3 11:58:33 2014
|
|
+++ src/image.c Sat Mar 28 16:03:38 2015
|
|
@@ -905,7 +905,7 @@ int gif2bitmap(char *inbuf, int insize, raw_bitmap **o
|
|
desc.size=insize;
|
|
desc.x.pos=0;
|
|
|
|
- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
|
|
+ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
|
|
return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons
|
|
|
|
bmp = new_raw_bitmap();
|
|
@@ -1083,7 +1083,7 @@ int gif2bitmap(char *inbuf, int insize, raw_bitmap **o
|
|
}
|
|
bmp->pal_bpp = bmp->bpp;
|
|
|
|
- DGifCloseFile(GifFile);
|
|
+ DGifCloseFile(GifFile, NULL);
|
|
return IMG_RET_OK;
|
|
}
|
|
|
|
@@ -1738,7 +1738,7 @@ static int bitmap2jp2 (raw_bitmap *bmp, float rate, ch
|
|
cmptparm->width = cwidth [cmptno];
|
|
cmptparm->height = cheight [cmptno];
|
|
cmptparm->prec = cbitlen [cmptno];
|
|
- cmptparm->sgnd = false; // we only generate unsigned components
|
|
+ cmptparm->sgnd = 0; // we only generate unsigned components
|
|
|
|
cshiftR [cmptno] = 8 - cbitlen [cmptno]; // calculate the resampling shift for this component
|
|
}
|