diff options
Diffstat (limited to 'source/blender/imbuf/intern/oiio/openimageio_api.cpp')
-rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 6 |
1 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 e887424d7b2..5c7b7d9fae4 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -32,7 +32,7 @@ OIIO_NAMESPACE_USING using std::string; using std::unique_ptr; -using uchar = unsigned char; +using uchar = uchar; template<class T, class Q> static void fill_all_channels(T *pixels, int width, int height, int components, Q alpha) @@ -147,9 +147,9 @@ static ImBuf *imb_oiio_load_image_float( extern "C" { -bool imb_is_a_photoshop(const unsigned char *mem, size_t size) +bool imb_is_a_photoshop(const uchar *mem, size_t size) { - const unsigned char magic[4] = {'8', 'B', 'P', 'S'}; + const uchar magic[4] = {'8', 'B', 'P', 'S'}; if (size < sizeof(magic)) { return false; } |