diff options
Diffstat (limited to 'source/blender/imbuf/intern/cineon')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 8 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.c | 26 |
2 files changed, 22 insertions, 12 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index 50785d7a857..eeccadf56c1 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -183,9 +183,9 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon return rvalue; } -int imb_save_cineon(struct ImBuf *buf, const char *myfile, int flags) +int imb_save_cineon(struct ImBuf *buf, const char *filepath, int flags) { - return imb_save_dpx_cineon(buf, myfile, 1, flags); + return imb_save_dpx_cineon(buf, filepath, 1, flags); } int imb_is_cineon(const unsigned char *buf) @@ -204,9 +204,9 @@ ImBuf *imb_load_cineon(const unsigned char *mem, return NULL; } -int imb_save_dpx(struct ImBuf *buf, const char *myfile, int flags) +int imb_save_dpx(struct ImBuf *buf, const char *filepath, int flags) { - return imb_save_dpx_cineon(buf, myfile, 0, flags); + return imb_save_dpx_cineon(buf, filepath, 0, flags); } int imb_is_dpx(const unsigned char *buf) diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index 6a81abd96e3..74a0684c35c 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -46,18 +46,28 @@ static int logImageSetData8(LogImageFile *logImage, LogImageElement logElement, static int logImageSetData10(LogImageFile *logImage, LogImageElement logElement, float *data); static int logImageSetData12(LogImageFile *logImage, LogImageElement logElement, float *data); static int logImageSetData16(LogImageFile *logImage, LogImageElement logElement, float *data); -static int logImageElementGetData(LogImageFile *dpx, LogImageElement logElement, float *data); -static int logImageElementGetData1(LogImageFile *dpx, LogImageElement logElement, float *data); -static int logImageElementGetData8(LogImageFile *dpx, LogImageElement logElement, float *data); -static int logImageElementGetData10(LogImageFile *dpx, LogImageElement logElement, float *data); -static int logImageElementGetData10Packed(LogImageFile *dpx, +static int logImageElementGetData(LogImageFile *logImage, LogImageElement logElement, float *data); +static int logImageElementGetData1(LogImageFile *logImage, + LogImageElement logElement, + float *data); +static int logImageElementGetData8(LogImageFile *logImage, + LogImageElement logElement, + float *data); +static int logImageElementGetData10(LogImageFile *logImage, + LogImageElement logElement, + float *data); +static int logImageElementGetData10Packed(LogImageFile *logImage, LogImageElement logElement, float *data); -static int logImageElementGetData12(LogImageFile *dpx, LogImageElement logElement, float *data); -static int logImageElementGetData12Packed(LogImageFile *dpx, +static int logImageElementGetData12(LogImageFile *logImage, + LogImageElement logElement, + float *data); +static int logImageElementGetData12Packed(LogImageFile *logImage, LogImageElement logElement, float *data); -static int logImageElementGetData16(LogImageFile *dpx, LogImageElement logElement, float *data); +static int logImageElementGetData16(LogImageFile *logImage, + LogImageElement logElement, + float *data); static int convertLogElementToRGBA(float *src, float *dst, LogImageFile *logImage, |