Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2003-12-04 21:18:05 +0300
committerKent Mein <mein@cs.umn.edu>2003-12-04 21:18:05 +0300
commit24624501a473c13f6a6d9c4676cbdd33b4a88e73 (patch)
tree6b0c79b38b21da22fac3e0a6f141b970e610b473 /source/blender/imbuf/intern/readimage.c
parent43369f076f3be5000f56079f31767ffc3e730d2b (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/readimage.c')
-rw-r--r--source/blender/imbuf/intern/readimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index fb574bf7da8..f15d3505374 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -127,7 +127,7 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) {
#else
if(1) {
#endif
- ibuf = imb_png_decode((uchar *)mem, size, flags);
+ ibuf = imb_loadpng((uchar *)mem, size, flags);
if (ibuf) return(ibuf);
}