From af4c389f9955c5975058733858017da68792f509 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 Nov 2020 17:03:28 +1100 Subject: Cleanup: imbuf callback naming Use `is_a` & `is_a_filepath` in callback names. --- source/blender/imbuf/intern/oiio/openimageio_api.cpp | 4 ++-- source/blender/imbuf/intern/oiio/openimageio_api.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/imbuf/intern/oiio') diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index d62258fbd2f..9d8c5d50a89 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -163,7 +163,7 @@ static ImBuf *imb_oiio_load_image_float( extern "C" { -int imb_is_a_photoshop(const char *filename) +int imb_is_a_filepath_photoshop(const char *filename) { const char *photoshop_extension[] = { ".psd", @@ -198,7 +198,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac const bool is_colorspace_manually_set = (colorspace[0] != '\0'); /* load image from file through OIIO */ - if (imb_is_a_photoshop(filename) == 0) { + if (imb_is_a_filepath_photoshop(filename) == 0) { return nullptr; } diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.h b/source/blender/imbuf/intern/oiio/openimageio_api.h index 3f5f234099c..135e3521f71 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.h +++ b/source/blender/imbuf/intern/oiio/openimageio_api.h @@ -31,7 +31,7 @@ extern "C" { struct ImBuf; -int imb_is_a_photoshop(const char *name); +int imb_is_a_filepath_photoshop(const char *name); int imb_save_photoshop(struct ImBuf *ibuf, const char *name, int flags); -- cgit v1.2.3