diff options
| author | Matt Ebb <matt@mke3.net> | 2010-06-01 05:01:25 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-06-01 05:01:25 +0400 |
| commit | 80a89d2de50e46d65940864d18ced946eec29ba7 (patch) | |
| tree | 756b0289fe23deebe7ec9f71a5f2f1259d772b1f /source/blender/imbuf/intern/filetype.c | |
| parent | ccda04131a7e1a8d6d011e6d3453979b540f5d52 (diff) | |
* Only print libtiff debug messages to the console when in debug mode
* Allow loading non 3/4 channel TIFFs (eg. greyscale). This was already
working, but disabled out of caution. Seems to work fine in my recent tests though.
Diffstat (limited to 'source/blender/imbuf/intern/filetype.c')
| -rw-r--r-- | source/blender/imbuf/intern/filetype.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index a0ff4476556..c2140e12013 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -54,9 +54,6 @@ void quicktime_init(void); void quicktime_exit(void); #endif -void libtiff_init(void); -void libtiff_exit(void); - ImFileType IMB_FILE_TYPES[]= { {NULL, NULL, imb_is_a_iris, imb_ftype_iris, imb_loadiris, imb_saveiris, NULL, 0, IMAGIC}, {NULL, NULL, imb_is_a_jpeg, imb_ftype_default, imb_load_jpeg, imb_savejpeg, NULL, 0, JPG}, @@ -66,7 +63,7 @@ ImFileType IMB_FILE_TYPES[]= { {NULL, NULL, imb_is_dpx, imb_ftype_default, imb_loaddpx, imb_save_dpx, NULL, IM_FTYPE_FLOAT, DPX}, {NULL, NULL, imb_is_cineon, imb_ftype_default, imb_loadcineon, imb_savecineon, NULL, IM_FTYPE_FLOAT, CINEON}, #ifdef WITH_TIFF - {NULL, NULL, imb_is_a_tiff, imb_ftype_default, imb_loadtiff, imb_savetiff, imb_loadtiletiff, 0, TIF}, + {imb_inittiff, NULL, imb_is_a_tiff, imb_ftype_default, imb_loadtiff, imb_savetiff, imb_loadtiletiff, 0, TIF}, #elif defined(__APPLE__) && defined(IMBUF_COCOA) {NULL, NULL, imb_is_a_cocoa, imb_ftype_cocoa, imb_imb_cocoaLoadImage, imb_savecocoa, NULL, 0, TIF}, #endif |