diff options
author | Kent Mein <mein@cs.umn.edu> | 2002-12-06 22:48:37 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2002-12-06 22:48:37 +0300 |
commit | cd4a60f5362b951826de8fc4218d30969c38095c (patch) | |
tree | e699411275651bd998a7ec5673116cb5c4218a2d /source/blender/imbuf | |
parent | fd05cdbaad4058520759478794a37a6204e8f0a3 (diff) |
sgefants patch to remove the License Key stuff.
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...
(Using cscope for LICENSE_KEY_VALID still turns up some stuff)
Kent
--
mein@cs.umn.edu
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/writeimage.c | 8 |
2 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index ea293e66289..fa59e55d333 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -312,19 +312,9 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy); short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags); /** - * This function pointer needs to be initialized to enable - * png writing from the ImBuf library. - * - * @attention Defined in writeimage.c - * @attention See also IMB_png_encode() - */ -extern short (*IMB_fp_png_encode)(struct ImBuf *ibuf, int file, int flags); - -/** * Encodes a png image from an ImBuf * * @attention Defined in png_encode.c - * @attention See also IMB_fp_png_encode */ short IMB_png_encode(struct ImBuf *ibuf, int file, int flags); diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index 015a062f1cf..49d827fcce5 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -58,10 +58,8 @@ #endif -short (*IMB_fp_png_encode)(struct ImBuf *ibuf, int file, int flags) = 0; - short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags) -{ +{ short ok=TRUE,delpl=FALSE; int file = -1; @@ -81,8 +79,8 @@ short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags) } } - if (IS_png(ibuf) && IMB_fp_png_encode) { - ok = IMB_fp_png_encode(ibuf,file,flags); + if (IS_png(ibuf)) { + ok = IMB_png_encode(ibuf,file,flags); if (ok) { close (file); return (ok); |