griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#27478] Crash on image editor after loading exr images

Browse Source 
patch from Ryakiotakis Antonis (psy-fi) with minor change.
This commit is contained in:
Campbell Barton
2011-05-25 11:06:30 +00:00
parent 49ad7345af
commit 1f1481841d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/imbuf/intern/scaling.c
View File

@@ -300,17 +300,18 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1)
uchar *p1, *p2 = NULL, *dest;
float *p1f, *destf, *p2f = NULL;
int x,y;
int do_rect, do_float;
const short do_rect= (ibuf1->rect != NULL);
const short do_float= (ibuf1->rect_float != NULL) && (ibuf2->rect_float != NULL);
if(do_rect && (ibuf2->rect == NULL)) {
imb_addrectImBuf(ibuf2);
}
do_rect= (ibuf1->rect != NULL);
p1f = ibuf1->rect_float;
destf=ibuf2->rect_float;
p1 = (uchar *) ibuf1->rect;
dest=(uchar *) ibuf2->rect;
do_float= (ibuf1->rect_float != NULL && ibuf2->rect_float != NULL);
for(y=ibuf2->y;y>0;y--){
if (do_rect) p2 = p1 + (ibuf1->x << 2);
if (do_float) p2f = p1f + (ibuf1->x << 2);