diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
| commit | 56173e512cab020a5bc96e6d3069641a03d47fbe (patch) | |
| tree | 112fcb93a1898fadb34c2b74ae32471a6364a969 /source/blender/imbuf | |
| parent | 6855d537e3112f7ba4d84524d06a524b0ea9f7b1 (diff) | |
| parent | a0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index b123d508f99..ab8824fdf85 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -179,7 +179,7 @@ int imb_is_a_photoshop(const char *filename) NULL }; - return BLI_testextensie_array(filename, photoshop_extension); + return BLI_path_extension_check_array(filename, photoshop_extension); } int imb_save_photoshop(struct ImBuf *ibuf, const char * /*name*/, int flags) diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index afa3ffb31f3..0b4490a3beb 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -159,7 +159,7 @@ static ImBuf *IMB_ibImageFromFile(const char *filepath, int flags, char colorspa static bool imb_is_filepath_format(const char *filepath) { /* return true if this is one of the formats that can't be loaded from memory */ - return BLI_testextensie_array(filepath, imb_ext_image_filepath_only); + return BLI_path_extension_check_array(filepath, imb_ext_image_filepath_only); } ImBuf *IMB_loadifffile(int file, const char *filepath, int flags, char colorspace[IM_MAX_SPACE], const char *descr) @@ -199,7 +199,7 @@ static void imb_cache_filename(char *filename, const char *name, int flags) /* read .tx instead if it exists and is not older */ if (flags & IB_tilecache) { BLI_strncpy(filename, name, IMB_FILENAME_SIZE); - if (!BLI_replace_extension(filename, IMB_FILENAME_SIZE, ".tx")) + if (!BLI_path_extension_replace(filename, IMB_FILENAME_SIZE, ".tx")) return; if (BLI_file_older(name, filename)) diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 9dfe926ddff..db57023500d 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -281,7 +281,7 @@ static int isffmpeg(const char *filename) AVCodec *pCodec; AVCodecContext *pCodecCtx; - if (BLI_testextensie_n( + if (BLI_path_extension_check_n( filename, ".swf", ".jpg", ".png", ".dds", ".tga", ".bmp", ".tif", ".exr", ".cin", ".wav", NULL)) { |