From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/imbuf/IMB_colormanagement.h | 4 +-- source/blender/imbuf/IMB_imbuf.h | 18 ++++++------ source/blender/imbuf/IMB_thumbs.h | 2 +- source/blender/imbuf/intern/IMB_filetype.h | 32 ++++++++++++---------- source/blender/imbuf/intern/IMB_indexer.h | 4 +-- source/blender/imbuf/intern/bmp.c | 4 +-- source/blender/imbuf/intern/cineon/cineon_dpx.c | 8 +++--- source/blender/imbuf/intern/cineon/logImageCore.c | 26 ++++++++++++------ source/blender/imbuf/intern/imageprocess.c | 4 +-- source/blender/imbuf/intern/iris.c | 6 ++-- source/blender/imbuf/intern/jpeg.c | 4 +-- .../blender/imbuf/intern/openexr/openexr_api.cpp | 2 +- source/blender/imbuf/intern/png.c | 19 +++++++------ source/blender/imbuf/intern/radiance_hdr.c | 4 +-- source/blender/imbuf/intern/targa.c | 4 +-- source/blender/imbuf/intern/tiff.c | 10 +++---- source/blender/imbuf/intern/writeimage.c | 6 ++-- 17 files changed, 85 insertions(+), 72 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 54f126684ae..f31839751b1 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -265,7 +265,7 @@ void IMB_colormanagement_colorspace_items_add(struct EnumPropertyItem **items, i /* ** Tile-based buffer management ** */ void IMB_partial_display_buffer_update(struct ImBuf *ibuf, const float *linear_buffer, - const unsigned char *buffer_byte, + const unsigned char *byte_buffer, int stride, int offset_x, int offset_y, @@ -279,7 +279,7 @@ void IMB_partial_display_buffer_update(struct ImBuf *ibuf, void IMB_partial_display_buffer_update_threaded( struct ImBuf *ibuf, const float *linear_buffer, - const unsigned char *buffer_byte, + const unsigned char *byte_buffer, int stride, int offset_x, int offset_y, diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 37046521dd8..8e243559a69 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -247,8 +247,8 @@ void IMB_rectclip(struct ImBuf *dbuf, int *srcy, int *width, int *height); -void IMB_rectcpy(struct ImBuf *drect, - const struct ImBuf *srect, +void IMB_rectcpy(struct ImBuf *dbuf, + const struct ImBuf *sbuf, int destx, int desty, int srcx, @@ -260,7 +260,7 @@ void IMB_rectblend(struct ImBuf *dbuf, const struct ImBuf *sbuf, unsigned short *dmask, const unsigned short *curvemask, - const unsigned short *mmask, + const unsigned short *texmask, float mask_max, int destx, int desty, @@ -277,7 +277,7 @@ void IMB_rectblend_threaded(struct ImBuf *dbuf, const struct ImBuf *sbuf, unsigned short *dmask, const unsigned short *curvemask, - const unsigned short *mmask, + const unsigned short *texmask, float mask_max, int destx, int desty, @@ -594,15 +594,15 @@ void bilinear_interpolation( struct ImBuf *in, struct ImBuf *out, float u, float v, int xout, int yout); void bicubic_interpolation_color( - struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v); + struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v); void nearest_interpolation_color( - struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v); + struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v); void nearest_interpolation_color_wrap( - struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v); + struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v); void bilinear_interpolation_color( - struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v); + struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v); void bilinear_interpolation_color_wrap( - struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v); + struct ImBuf *in, unsigned char outI[4], float outF[4], float u, float v); void IMB_alpha_under_color_float(float *rect_float, int x, int y, float backcol[3]); void IMB_alpha_under_color_byte(unsigned char *rect, int x, int y, const float backcol[3]); diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h index e8c244aaba7..a096301ed97 100644 --- a/source/blender/imbuf/IMB_thumbs.h +++ b/source/blender/imbuf/IMB_thumbs.h @@ -62,7 +62,7 @@ typedef enum ThumbSource { struct ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, - struct ImBuf *ibuf); + struct ImBuf *img); /* read thumbnail for file and returns new imbuf for thumbnail */ struct ImBuf *IMB_thumb_read(const char *path, ThumbSize size); diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h index 2b00b87d3d2..93a3a98c3d1 100644 --- a/source/blender/imbuf/intern/IMB_filetype.h +++ b/source/blender/imbuf/intern/IMB_filetype.h @@ -33,14 +33,14 @@ typedef struct ImFileType { void (*exit)(void); int (*is_a)(const unsigned char *buf); - int (*is_a_filepath)(const char *name); + int (*is_a_filepath)(const char *filepath); int (*ftype)(const struct ImFileType *type, const struct ImBuf *ibuf); struct ImBuf *(*load)(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); - struct ImBuf *(*load_filepath)(const char *name, int flags, char colorspace[IM_MAX_SPACE]); - int (*save)(struct ImBuf *ibuf, const char *name, int flags); + struct ImBuf *(*load_filepath)(const char *filepath, int flags, char colorspace[IM_MAX_SPACE]); + int (*save)(struct ImBuf *ibuf, const char *filepath, int flags); void (*load_tile)(struct ImBuf *ibuf, const unsigned char *mem, size_t size, @@ -68,12 +68,12 @@ void imb_tile_cache_tile_free(struct ImBuf *ibuf, int tx, int ty); /* Type Specific Functions */ /* png */ -int imb_is_a_png(const unsigned char *buf); +int imb_is_a_png(const unsigned char *mem); struct ImBuf *imb_loadpng(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savepng(struct ImBuf *ibuf, const char *name, int flags); +int imb_savepng(struct ImBuf *ibuf, const char *filepath, int flags); /* targa */ int imb_is_a_targa(const unsigned char *buf); @@ -81,7 +81,7 @@ struct ImBuf *imb_loadtarga(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savetarga(struct ImBuf *ibuf, const char *name, int flags); +int imb_savetarga(struct ImBuf *ibuf, const char *filepath, int flags); /* iris */ int imb_is_a_iris(const unsigned char *mem); @@ -89,7 +89,7 @@ struct ImBuf *imb_loadiris(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags); +int imb_saveiris(struct ImBuf *ibuf, const char *filepath, int flags); /* jp2 */ int imb_is_a_jp2(const unsigned char *buf); @@ -97,12 +97,14 @@ struct ImBuf *imb_load_jp2(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -struct ImBuf *imb_load_jp2_filepath(const char *name, int flags, char colorspace[IM_MAX_SPACE]); -int imb_save_jp2(struct ImBuf *ibuf, const char *name, int flags); +struct ImBuf *imb_load_jp2_filepath(const char *filepath, + int flags, + char colorspace[IM_MAX_SPACE]); +int imb_save_jp2(struct ImBuf *ibuf, const char *filepath, int flags); /* jpeg */ int imb_is_a_jpeg(const unsigned char *mem); -int imb_savejpeg(struct ImBuf *ibuf, const char *name, int flags); +int imb_savejpeg(struct ImBuf *ibuf, const char *filepath, int flags); struct ImBuf *imb_load_jpeg(const unsigned char *buffer, size_t size, int flags, @@ -114,11 +116,11 @@ struct ImBuf *imb_bmp_decode(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savebmp(struct ImBuf *ibuf, const char *name, int flags); +int imb_savebmp(struct ImBuf *ibuf, const char *filepath, int flags); /* cineon */ int imb_is_cineon(const unsigned char *buf); -int imb_save_cineon(struct ImBuf *buf, const char *name, int flags); +int imb_save_cineon(struct ImBuf *buf, const char *filepath, int flags); struct ImBuf *imb_load_cineon(const unsigned char *mem, size_t size, int flags, @@ -126,7 +128,7 @@ struct ImBuf *imb_load_cineon(const unsigned char *mem, /* dpx */ int imb_is_dpx(const unsigned char *buf); -int imb_save_dpx(struct ImBuf *buf, const char *name, int flags); +int imb_save_dpx(struct ImBuf *buf, const char *filepath, int flags); struct ImBuf *imb_load_dpx(const unsigned char *mem, size_t size, int flags, @@ -138,7 +140,7 @@ struct ImBuf *imb_loadhdr(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]); -int imb_savehdr(struct ImBuf *ibuf, const char *name, int flags); +int imb_savehdr(struct ImBuf *ibuf, const char *filepath, int flags); /* tiff */ void imb_inittiff(void); @@ -149,4 +151,4 @@ struct ImBuf *imb_loadtiff(const unsigned char *mem, char colorspace[IM_MAX_SPACE]); void imb_loadtiletiff( struct ImBuf *ibuf, const unsigned char *mem, size_t size, int tx, int ty, unsigned int *rect); -int imb_savetiff(struct ImBuf *ibuf, const char *name, int flags); +int imb_savetiff(struct ImBuf *ibuf, const char *filepath, int flags); diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index 7cd11e137c2..07c47965262 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -94,8 +94,8 @@ void IMB_index_builder_proc_frame(anim_index_builder *fp, void IMB_index_builder_finish(anim_index_builder *fp, int rollback); struct anim_index *IMB_indexer_open(const char *name); -unsigned long long IMB_indexer_get_seek_pos(struct anim_index *idx, int frameno_index); -unsigned long long IMB_indexer_get_seek_pos_dts(struct anim_index *idx, int frameno_index); +unsigned long long IMB_indexer_get_seek_pos(struct anim_index *idx, int frame_index); +unsigned long long IMB_indexer_get_seek_pos_dts(struct anim_index *idx, int frame_index); int IMB_indexer_get_frame_index(struct anim_index *idx, int frameno); unsigned long long IMB_indexer_get_pts(struct anim_index *idx, int frame_index); diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index f517a3c15e8..0b185f3442a 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -296,7 +296,7 @@ static int putShortLSB(ushort us, FILE *ofile) } /* Found write info at http://users.ece.gatech.edu/~slabaugh/personal/c/bitmapUnix.c */ -int imb_savebmp(ImBuf *ibuf, const char *name, int UNUSED(flags)) +int imb_savebmp(ImBuf *ibuf, const char *filepath, int UNUSED(flags)) { BMPINFOHEADER infoheader; @@ -307,7 +307,7 @@ int imb_savebmp(ImBuf *ibuf, const char *name, int UNUSED(flags)) const size_t bytesize = (ibuf->x * bytes_per_pixel + pad_bytes_per_scanline) * ibuf->y; const uchar *data = (const uchar *)ibuf->rect; - FILE *ofile = BLI_fopen(name, "wb"); + FILE *ofile = BLI_fopen(filepath, "wb"); if (ofile == NULL) { return 0; } 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, diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 8525991aa40..79382e3be76 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -322,7 +322,7 @@ void nearest_interpolation_color_wrap( } } -void nearest_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout, int yout) +void nearest_interpolation(ImBuf *in, ImBuf *out, float u, float v, int xout, int yout) { unsigned char *outI = NULL; float *outF = NULL; @@ -334,7 +334,7 @@ void nearest_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout, in /* gcc warns these could be uninitialized, but its ok. */ pixel_from_buffer(out, &outI, &outF, xout, yout); - nearest_interpolation_color(in, outI, outF, x, y); + nearest_interpolation_color(in, outI, outF, u, v); } /*********************** Threaded image processing *************************/ diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 2d8f1510d7b..12c4c63849c 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -109,7 +109,7 @@ static void readheader(MFileOffset *inf, IMAGE *image); static int writeheader(FILE *outf, IMAGE *image); static ushort getshort(MFileOffset *inf); -static uint getlong(MFileOffset *inf); +static uint getlong(MFileOffset *mofs); static void putshort(FILE *outf, ushort val); static int putlong(FILE *outf, uint val); static int writetab(FILE *outf, uint *tab, int len); @@ -969,7 +969,7 @@ static int compressrow(uchar *lbuf, uchar *rlebuf, int z, int cnt) return optr - (uchar *)rlebuf; } -int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags) +int imb_saveiris(struct ImBuf *ibuf, const char *filepath, int flags) { short zsize; int ret; @@ -982,7 +982,7 @@ int imb_saveiris(struct ImBuf *ibuf, const char *name, int flags) IMB_convert_rgba_to_abgr(ibuf); test_endian_zbuf(ibuf); - ret = output_iris(ibuf->rect, ibuf->x, ibuf->y, zsize, name, ibuf->zbuf); + ret = output_iris(ibuf->rect, ibuf->x, ibuf->y, zsize, filepath, ibuf->zbuf); /* restore! Quite clumsy, 2 times a switch... maybe better a malloc ? */ IMB_convert_rgba_to_abgr(ibuf); diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 3346f1c0964..525284bd867 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -642,9 +642,9 @@ static int save_stdjpeg(const char *name, struct ImBuf *ibuf) return 1; } -int imb_savejpeg(struct ImBuf *ibuf, const char *name, int flags) +int imb_savejpeg(struct ImBuf *ibuf, const char *filepath, int flags) { ibuf->flags = flags; - return save_stdjpeg(name, ibuf); + return save_stdjpeg(filepath, ibuf); } diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 67bb3677834..380ddaaefad 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -102,7 +102,7 @@ static bool exr_has_multiview(MultiPartInputFile &file); static bool exr_has_multipart_file(MultiPartInputFile &file); static bool exr_has_alpha(MultiPartInputFile &file); static bool exr_has_zbuffer(MultiPartInputFile &file); -static void exr_printf(const char *__restrict format, ...); +static void exr_printf(const char *__restrict fmt, ...); static void imb_exr_type_by_channels(ChannelList &channels, StringVector &views, bool *r_singlelayer, diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 2eb1b216572..dbae641f707 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -119,7 +119,7 @@ BLI_INLINE unsigned short ftoshort(float val) return unit_float_to_ushort_clamp(val); } -int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) +int imb_savepng(struct ImBuf *ibuf, const char *filepath, int flags) { png_structp png_ptr; png_infop info_ptr; @@ -155,25 +155,26 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) /* for prints */ if (flags & IB_mem) { - name = ""; + filepath = ""; } bytesperpixel = (ibuf->planes + 7) >> 3; if ((bytesperpixel > 4) || (bytesperpixel == 2)) { - printf("imb_savepng: Unsupported bytes per pixel: %d for file: '%s'\n", bytesperpixel, name); + printf( + "imb_savepng: Unsupported bytes per pixel: %d for file: '%s'\n", bytesperpixel, filepath); return 0; } png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png_ptr == NULL) { - printf("imb_savepng: Cannot png_create_write_struct for file: '%s'\n", name); + printf("imb_savepng: Cannot png_create_write_struct for file: '%s'\n", filepath); return 0; } info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - printf("imb_savepng: Cannot png_create_info_struct for file: '%s'\n", name); + printf("imb_savepng: Cannot png_create_info_struct for file: '%s'\n", filepath); return 0; } @@ -192,13 +193,13 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) ibuf->x, ibuf->y, bytesperpixel, - name); + filepath); } /* allocate memory for an array of row-pointers */ row_pointers = (png_bytepp)MEM_mallocN(ibuf->y * sizeof(png_bytep), "row_pointers"); if (row_pointers == NULL) { - printf("imb_savepng: Cannot allocate row-pointers array for file '%s'\n", name); + printf("imb_savepng: Cannot allocate row-pointers array for file '%s'\n", filepath); } if ((pixels == NULL && pixels16 == NULL) || (row_pointers == NULL) || @@ -396,7 +397,7 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) png_set_write_fn(png_ptr, (png_voidp)ibuf, WriteData, Flush); } else { - fp = BLI_fopen(name, "wb"); + fp = BLI_fopen(filepath, "wb"); if (!fp) { png_destroy_write_struct(&png_ptr, &info_ptr); if (pixels) { @@ -405,7 +406,7 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags) if (pixels16) { MEM_freeN(pixels16); } - printf("imb_savepng: Cannot open file for writing: '%s'\n", name); + printf("imb_savepng: Cannot open file for writing: '%s'\n", filepath); return 0; } png_init_io(png_ptr, fp); diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index 6ed01c73f04..3dd26e1f7a2 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -409,9 +409,9 @@ static void writeHeader(FILE *file, int width, int height) fputc(10, file); } -int imb_savehdr(struct ImBuf *ibuf, const char *name, int flags) +int imb_savehdr(struct ImBuf *ibuf, const char *filepath, int flags) { - FILE *file = BLI_fopen(name, "wb"); + FILE *file = BLI_fopen(filepath, "wb"); float *fp = NULL; size_t width = ibuf->x, height = ibuf->y; unsigned char *cp = NULL; diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 9f33c7ea2b2..5f373e4bd3a 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -286,7 +286,7 @@ static bool dumptarga(struct ImBuf *ibuf, FILE *file) return 1; } -int imb_savetarga(struct ImBuf *ibuf, const char *name, int flags) +int imb_savetarga(struct ImBuf *ibuf, const char *filepath, int flags) { char buf[20] = {0}; FILE *fildes; @@ -321,7 +321,7 @@ int imb_savetarga(struct ImBuf *ibuf, const char *name, int flags) if (ibuf->planes == 32) { buf[17] |= 0x08; } - fildes = BLI_fopen(name, "wb"); + fildes = BLI_fopen(filepath, "wb"); if (!fildes) { return 0; } diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index c95476fa628..9b579c4780c 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -304,13 +304,13 @@ static TIFF *imb_tiff_client_open(ImbTIFFMemFile *memFile, const unsigned char * * hence my manual comparison. - Jonathan Merritt (lancelet) 4th Sept 2005. */ #define IMB_TIFF_NCB 4 /* number of comparison bytes used */ -int imb_is_a_tiff(const unsigned char *mem) +int imb_is_a_tiff(const unsigned char *buf) { const char big_endian[IMB_TIFF_NCB] = {0x4d, 0x4d, 0x00, 0x2a}; const char lil_endian[IMB_TIFF_NCB] = {0x49, 0x49, 0x2a, 0x00}; - return ((memcmp(big_endian, mem, IMB_TIFF_NCB) == 0) || - (memcmp(lil_endian, mem, IMB_TIFF_NCB) == 0)); + return ((memcmp(big_endian, buf, IMB_TIFF_NCB) == 0) || + (memcmp(lil_endian, buf, IMB_TIFF_NCB) == 0)); } static void scanline_contig_16bit(float *rectf, @@ -742,7 +742,7 @@ void imb_loadtiletiff( * \return: 1 if the function is successful, 0 on failure. */ -int imb_savetiff(ImBuf *ibuf, const char *name, int flags) +int imb_savetiff(ImBuf *ibuf, const char *filepath, int flags) { TIFF *image = NULL; uint16 samplesperpixel, bitspersample; @@ -799,7 +799,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags) image = TIFFOpenW(wname, "w"); free(wname); #else - image = TIFFOpen(name, "w"); + image = TIFFOpen(filepath, "w"); #endif if (image == NULL) { diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index 1d77233a7e2..e321470559a 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -41,13 +41,13 @@ static bool prepare_write_imbuf(const ImFileType *type, ImBuf *ibuf) return IMB_prepare_write_ImBuf((type->flag & IM_FTYPE_FLOAT), ibuf); } -short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags) +short IMB_saveiff(struct ImBuf *ibuf, const char *filepath, int flags) { const ImFileType *type; errno = 0; - BLI_assert(!BLI_path_is_rel(name)); + BLI_assert(!BLI_path_is_rel(filepath)); if (ibuf == NULL) { return false; @@ -60,7 +60,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags) prepare_write_imbuf(type, ibuf); - result = type->save(ibuf, name, flags); + result = type->save(ibuf, filepath, flags); return result; } -- cgit v1.2.3