diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 19:52:06 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 19:55:00 +0400 |
| commit | a2930c634f5debf2dc25cc2b80e7c91f84eae833 (patch) | |
| tree | 9564c001a6fc754cf77cab949bc1b59262bca7fd /source/blender/imbuf/intern/filetype.c | |
| parent | 9f2f2ed546b6577b246f7b41e79d2c5c17b77e70 (diff) | |
Code cleanup: remove quicktime image loading code (not animation loading).
This code has been broken for a few years and no one noticed, it's also less
useful now that we support PSD image loading ourselves which was the original
motivation to have this.
Diffstat (limited to 'source/blender/imbuf/intern/filetype.c')
| -rw-r--r-- | source/blender/imbuf/intern/filetype.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index f9e05dbd6d6..b6b46c72384 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -62,17 +62,6 @@ static int imb_ftype_iris(ImFileType *type, ImBuf *ibuf) (void)type; return (ibuf->ftype == IMAGIC); } -#ifdef WITH_QUICKTIME -static int imb_ftype_quicktime(ImFileType *UNUSED(type), ImBuf *UNUSED(ibuf)) -{ - return 0; /* XXX */ -} -#endif - -#ifdef WITH_QUICKTIME -void quicktime_init(void); -void quicktime_exit(void); -#endif ImFileType IMB_FILE_TYPES[] = { {NULL, NULL, imb_is_a_jpeg, NULL, imb_ftype_default, imb_load_jpeg, NULL, imb_savejpeg, NULL, 0, JPG, COLOR_ROLE_DEFAULT_BYTE}, @@ -99,9 +88,6 @@ ImFileType IMB_FILE_TYPES[] = { #ifdef WITH_DDS {NULL, NULL, imb_is_a_dds, NULL, imb_ftype_default, imb_load_dds, NULL, NULL, NULL, 0, DDS, COLOR_ROLE_DEFAULT_BYTE}, #endif -#ifdef WITH_QUICKTIME - {quicktime_init, quicktime_exit, imb_is_a_quicktime, NULL, imb_ftype_quicktime, imb_quicktime_decode, NULL, NULL, 0, QUICKTIME, COLOR_ROLE_DEFAULT_BYTE}, -#endif #ifdef WITH_OPENIMAGEIO {NULL, NULL, NULL, imb_is_a_photoshop, imb_ftype_default, NULL, imb_load_photoshop, NULL, NULL, IM_FTYPE_FLOAT, PSD, COLOR_ROLE_DEFAULT_FLOAT}, #endif @@ -117,6 +103,10 @@ void imb_filetypes_init(void) for (type = IMB_FILE_TYPES; type < IMB_FILE_TYPES_LAST; type++) if (type->init) type->init(); + +#ifdef WITH_QUICKTIME + quicktime_init(); +#endif } void imb_filetypes_exit(void) @@ -126,5 +116,9 @@ void imb_filetypes_exit(void) for (type = IMB_FILE_TYPES; type < IMB_FILE_TYPES_LAST; type++) if (type->exit) type->exit(); + +#ifdef WITH_QUICKTIME + quicktime_exit(); +#endif } |