diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-12-04 21:18:05 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-12-04 21:18:05 +0300 |
| commit | 24624501a473c13f6a6d9c4676cbdd33b4a88e73 (patch) | |
| tree | 6b0c79b38b21da22fac3e0a6f141b970e610b473 /source/blender/imbuf/intern/iris.c | |
| parent | 43369f076f3be5000f56079f31767ffc3e730d2b (diff) | |
This looks like a lot but its a few small changes.
Summary: standardized imageformat functions(make function names similar, and
parameters in same order where relavant), small code cleanups, and
added a description of how to add an image format to blender.
Kent
Specifics:
merged png_decode.c and png_encode.c to png.c and cleaned function calls.
fixed some spacing in IMB_imbuf_types.h
casting cleanups:
intern/amiga.c
intern/ham.c
intern/iris.c
Modified switch statements to have a default type to insure values are set:
intern/antialias.c
Initalization of some vars and make types similar.
intern/bitplanes.c
cleaned function calls, and changed if else to if's with return:
intern/jpeg.c
added {}'s in multidemensional arrays.
intern/matrix.h
Made a little cleaner to read, and matched above changes.
intern/readimage.c
intern/writeimage.c
Diffstat (limited to 'source/blender/imbuf/intern/iris.c')
| -rw-r--r-- | source/blender/imbuf/intern/iris.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 1619616cc67..469bbc414e5 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -321,7 +321,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) rledat = file_data + file_offset; file_offset += lengthtab[y+z*ysize]; - expandrow(lptr, rledat, 3-z); + expandrow((uchar *)lptr, rledat, 3-z); lptr += xsize; } } @@ -338,8 +338,8 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) rledat = file_data + file_offset; file_offset += lengthtab[y+z*ysize]; - if(z<4) expandrow(lptr, rledat, 3-z); - else if(z<8) expandrow(zptr, rledat, 7-z); + if(z<4) expandrow((uchar *)lptr, rledat, 3-z); + else if(z<8) expandrow((uchar *)zptr, rledat, 7-z); } lptr += xsize; zptr += xsize; @@ -367,7 +367,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, int flags) for(y = 0; y < ysize; y++) { - interleaverow(lptr, rledat, 3-z, xsize); + interleaverow((uchar *)lptr, rledat, 3-z, xsize); rledat += xsize; lptr += xsize; @@ -571,15 +571,15 @@ static int output_iris(unsigned int *lptr, int xsize, int ysize, int zsize, int for (z = 0; z < zsize; z++) { if (zsize == 1) { - lumrow(lptr,lumbuf,xsize); - len = compressrow(lumbuf,rlebuf,CHANOFFSET(z),xsize); + lumrow((uchar *)lptr,(uchar *)lumbuf,xsize); + len = compressrow((uchar *)lumbuf,rlebuf,CHANOFFSET(z),xsize); } else { if(z<4) { - len = compressrow(lptr, rlebuf,CHANOFFSET(z),xsize); + len = compressrow((uchar *)lptr, rlebuf,CHANOFFSET(z),xsize); } else if(z<8 && zptr) { - len = compressrow(zptr, rlebuf,CHANOFFSET(z-4),xsize); + len = compressrow((uchar *)zptr, rlebuf,CHANOFFSET(z-4),xsize); } } if(len>rlebuflen) { |