[Bf-blender-cvs] [4682a0882f0] master: Cleanup: use "filepath" instead of "filename" for full paths
Campbell Barton
noreply at git.blender.org
Thu Mar 24 06:56:15 CET 2022
Commit: 4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b
Author: Campbell Barton
Date: Thu Mar 24 16:33:32 2022 +1100
Branches: master
https://developer.blender.org/rB4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b
Cleanup: use "filepath" instead of "filename" for full paths
Reserve "filename" when only the name component is used.
===================================================================
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf.c
M source/blender/blenfont/intern/blf_dir.c
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_internal.h
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/blenfont/intern/blf_thumbs.c
M source/blender/blenkernel/BKE_dynamicpaint.h
M source/blender/blenkernel/BKE_image_save.h
M source/blender/blenkernel/BKE_packedFile.h
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/image_save.cc
M source/blender/blenkernel/intern/packedFile.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/physics/dynamicpaint_ops.c
M source/blender/imbuf/IMB_openexr.h
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
M source/blender/io/gpencil/gpencil_io.h
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/io/gpencil/intern/gpencil_io_base.hh
M source/blender/io/gpencil/intern/gpencil_io_capi.cc
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.hh
M source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
M source/blender/io/gpencil/intern/gpencil_io_export_svg.hh
M source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
M source/blender/io/gpencil/intern/gpencil_io_import_svg.hh
M source/blender/makesrna/intern/rna_image_api.c
M source/blender/makesrna/intern/rna_text.c
M source/blender/python/generic/blf_py_api.c
M source/blender/render/RE_engine.h
M source/blender/render/intern/pipeline.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 3817fe59f95..058b0f120f7 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -44,7 +44,7 @@ int BLF_load_mem_unique(const char *name, const unsigned char *mem, int mem_size
void BLF_unload(const char *name) ATTR_NONNULL();
void BLF_unload_id(int fontid);
-char *BLF_display_name_from_file(const char *filename);
+char *BLF_display_name_from_file(const char *filepath);
/**
* Check if font supports a particular glyph.
@@ -279,7 +279,7 @@ void BLF_dir_free(char **dirs, int count) ATTR_NONNULL();
*
* \note called from a thread, so it bypasses the normal BLF_* api (which isn't thread-safe).
*/
-void BLF_thumb_preview(const char *filename,
+void BLF_thumb_preview(const char *filepath,
const char **draw_str,
const char **i18n_draw_str,
unsigned char draw_str_lines,
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 043d6da7d73..17d6e431632 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -158,14 +158,14 @@ int BLF_load_unique(const char *name)
return -1;
}
- char *filename = blf_dir_search(name);
- if (!filename) {
+ char *filepath = blf_dir_search(name);
+ if (!filepath) {
printf("Can't find font: %s\n", name);
return -1;
}
- FontBLF *font = blf_font_new(name, filename);
- MEM_freeN(filename);
+ FontBLF *font = blf_font_new(name, filepath);
+ MEM_freeN(filepath);
if (!font) {
printf("Can't load font: %s\n", name);
@@ -869,9 +869,9 @@ void BLF_draw_buffer(int fontid, const char *str, const size_t str_len)
BLF_draw_buffer_ex(fontid, str, str_len, NULL);
}
-char *BLF_display_name_from_file(const char *filename)
+char *BLF_display_name_from_file(const char *filepath)
{
- FontBLF *font = blf_font_new("font_name", filename);
+ FontBLF *font = blf_font_new("font_name", filepath);
if (!font) {
return NULL;
}
diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c
index 69b44ed9b01..8534a8c583f 100644
--- a/source/blender/blenfont/intern/blf_dir.c
+++ b/source/blender/blenfont/intern/blf_dir.c
@@ -132,12 +132,12 @@ char *blf_dir_search(const char *file)
return s;
}
-char *blf_dir_metrics_search(const char *filename)
+char *blf_dir_metrics_search(const char *filepath)
{
char *mfile;
char *s;
- mfile = BLI_strdup(filename);
+ mfile = BLI_strdup(filepath);
s = strrchr(mfile, '.');
if (s) {
if (BLI_strnlen(s, 4) < 4) {
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index c4bd22d1310..f833eb96f38 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -1213,14 +1213,14 @@ static void blf_font_fill(FontBLF *font)
font->glyph_cache_mutex = &blf_glyph_cache_mutex;
}
-FontBLF *blf_font_new(const char *name, const char *filename)
+FontBLF *blf_font_new(const char *name, const char *filepath)
{
FontBLF *font;
FT_Error err;
char *mfile;
font = (FontBLF *)MEM_callocN(sizeof(FontBLF), "blf_font_new");
- err = FT_New_Face(ft_lib, filename, 0, &font->face);
+ err = FT_New_Face(ft_lib, filepath, 0, &font->face);
if (err) {
if (ELEM(err, FT_Err_Unknown_File_Format, FT_Err_Unimplemented_Feature)) {
printf("Format of this font file is not supported\n");
@@ -1246,17 +1246,17 @@ FontBLF *blf_font_new(const char *name, const char *filename)
return NULL;
}
- mfile = blf_dir_metrics_search(filename);
+ mfile = blf_dir_metrics_search(filepath);
if (mfile) {
err = FT_Attach_File(font->face, mfile);
if (err) {
- fprintf(stderr, "FT_Attach_File failed to load '%s' with error %d\n", filename, (int)err);
+ fprintf(stderr, "FT_Attach_File failed to load '%s' with error %d\n", filepath, (int)err);
}
MEM_freeN(mfile);
}
font->name = BLI_strdup(name);
- font->filename = BLI_strdup(filename);
+ font->filepath = BLI_strdup(filepath);
blf_font_fill(font);
if (FT_HAS_KERNING(font->face)) {
@@ -1303,7 +1303,7 @@ FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem, int m
}
font->name = BLI_strdup(name);
- font->filename = NULL;
+ font->filepath = NULL;
blf_font_fill(font);
return font;
}
@@ -1317,8 +1317,8 @@ void blf_font_free(FontBLF *font)
}
FT_Done_Face(font->face);
- if (font->filename) {
- MEM_freeN(font->filename);
+ if (font->filepath) {
+ MEM_freeN(font->filepath);
}
if (font->name) {
MEM_freeN(font->name);
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 14e1a8f72d1..81a1460df4d 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -25,7 +25,7 @@ char *blf_dir_search(const char *file);
* Some font have additional file with metrics information,
* in general, the extension of the file is: `.afm` or `.pfm`
*/
-char *blf_dir_metrics_search(const char *filename);
+char *blf_dir_metrics_search(const char *filepath);
/* int blf_dir_split(const char *str, char *file, int *size); */ /* UNUSED */
int blf_font_init(void);
@@ -36,7 +36,7 @@ bool blf_font_id_is_valid(int fontid);
void blf_draw_buffer__start(struct FontBLF *font);
void blf_draw_buffer__end(void);
-struct FontBLF *blf_font_new(const char *name, const char *filename);
+struct FontBLF *blf_font_new(const char *name, const char *filepath);
struct FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem, int mem_size);
void blf_font_attach_from_mem(struct FontBLF *font, const unsigned char *mem, int mem_size);
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 61b6edc4974..23dc2fda38c 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -147,8 +147,8 @@ typedef struct FontBLF {
/* # of times this font was loaded */
unsigned int reference_count;
- /* filename or NULL. */
- char *filename;
+ /** File-path or NULL. */
+ char *filepath;
/* aspect ratio or scale. */
float aspect[3];
diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c
index 9d9a8a51d0f..e57ed9abffd 100644
--- a/source/blender/blenfont/intern/blf_thumbs.c
+++ b/source/blender/blenfont/intern/blf_thumbs.c
@@ -29,7 +29,7 @@
#include "BLI_strict_flags.h"
-void BLF_thumb_preview(const char *filename,
+void BLF_thumb_preview(const char *filepath,
const char **draw_str,
const char **i18n_draw_str,
const unsigned char draw_str_lines,
@@ -49,9 +49,9 @@ void BLF_thumb_preview(const char *filename,
FontBLF *font;
/* Create a new blender font obj and fill it with default values */
- font = blf_font_new("thumb_font", filename);
+ font = blf_font_new("thumb_font", filepath);
if (!font) {
- printf("Info: Can't load font '%s', no preview possible\n", filename);
+ printf("Info: Can't load font '%s', no preview possible\n", filepath);
return;
}
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h
index 5a1c99774fd..109d3e6d977 100644
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@ -129,7 +129,7 @@ int dynamicPaint_calculateFrame(struct DynamicPaintSurface *surface,
struct Object *cObject,
int frame);
void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface,
- char *filename,
+ const char *filepath,
short output_layer);
/* PaintPoint state */
diff --git a/source/blender/blenkernel/BKE_image_save.h b/source/blender/blenkernel/BKE_image_save.h
index b022e677845..052fc937af9 100644
--- a/source/blender/blenkernel/BKE_image_save.h
+++ b/source/blender/blenkernel/BKE_image_save.h
@@ -49,21 +49,26 @@ bool BKE_image_save(struct ReportList *reports,
/* Render saving. */
-/* Save single or multilayer OpenEXR files from the render result.
- * Optionally saves only a specific view or layer. */
+/**
+ * Save single or multi-layer OpenEXR files from the render result.
+ * Optionally saves only a specific view or layer.
+ */
bool BKE_image_render_write_exr(struct ReportList *reports,
const struct RenderResult *rr,
- const char *filename,
+ const char *filepath,
const struct ImageFormatData *imf,
const bool save_as_render,
const char *view,
int layer);
+/**
+ * \param filepath_basis: May be used as-is, or used as a basis for multi-view images.
+ */
bool BKE_image_render_write(struct ReportList *reports,
struct RenderResult *rr,
const struct Scene *scene,
const bool stamp,
- const char *name);
+ const char *filepath_basis);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 8433894b8c5..893aa2a5b1c 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -45,7 +45,7 @@ enum ePF_FileStatus {
struct PackedFile *BKE_packedfile_duplicate(const struct PackedFile *pf_src);
struct PackedFile *BKE_packedfile_new(struct ReportList *reports,
- const char *filename,
+ const char *filepath,
const char *basepath);
struct PackedFile *BKE_packedfile_ne
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list