Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-11-09 09:03:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-11-09 09:03:28 +0300
commitaf4c389f9955c5975058733858017da68792f509 (patch)
tree2b2f4751ad632ca7aeb292ae7065a1f1ea9475d4 /source/blender/imbuf/intern/oiio
parente118426e4695a97d67e65d69677f3c4e2db50a56 (diff)
Cleanup: imbuf callback naming
Use `is_a` & `is_a_filepath` in callback names.
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
-rw-r--r--source/blender/imbuf/intern/oiio/openimageio_api.cpp4
-rw-r--r--source/blender/imbuf/intern/oiio/openimageio_api.h2
2 files changed, 3 insertions, 3 deletions
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);