From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/blenkernel/BKE_font.h | 60 ++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 26 deletions(-) (limited to 'source/blender/blenkernel/BKE_font.h') diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index 009efabbbe6..e440d617f7a 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -36,41 +36,43 @@ struct Object; struct VFont; struct CharTrans { - float xof, yof; - float rot; - short linenr, charnr; - char dobreak; + float xof, yof; + float rot; + short linenr, charnr; + char dobreak; }; typedef struct EditFontSelBox { - float x, y, w, h; - float rot; + float x, y, w, h; + float rot; } EditFontSelBox; typedef struct EditFont { - wchar_t *textbuf; - struct CharInfo *textbufinfo; + wchar_t *textbuf; + struct CharInfo *textbufinfo; - /* array of rectangles & rotation */ - float textcurs[4][2]; - EditFontSelBox *selboxes; - int selboxes_len; + /* array of rectangles & rotation */ + float textcurs[4][2]; + EditFontSelBox *selboxes; + int selboxes_len; - /* positional vars relative to the textbuf, textbufinfo (not utf8 bytes) - * a copy of these is kept in Curve, but use these in editmode */ - int len, pos; - int selstart, selend; + /* positional vars relative to the textbuf, textbufinfo (not utf8 bytes) + * a copy of these is kept in Curve, but use these in editmode */ + int len, pos; + int selstart, selend; } EditFont; - bool BKE_vfont_is_builtin(struct VFont *vfont); void BKE_vfont_builtin_register(void *mem, int size); void BKE_vfont_free_data(struct VFont *vfont); void BKE_vfont_free(struct VFont *sc); void BKE_vfont_init(struct VFont *vfont); -void BKE_vfont_copy_data(struct Main *bmain, struct VFont *vfont_dst, const struct VFont *vfont_src, const int flag); +void BKE_vfont_copy_data(struct Main *bmain, + struct VFont *vfont_dst, + const struct VFont *vfont_src, + const int flag); struct VFont *BKE_vfont_builtin_get(void); struct VFont *BKE_vfont_load(struct Main *bmain, const char *filepath); struct VFont *BKE_vfont_load_exists_ex(struct Main *bmain, const char *filepath, bool *r_exists); @@ -78,22 +80,28 @@ struct VFont *BKE_vfont_load_exists(struct Main *bmain, const char *filepath); void BKE_vfont_make_local(struct Main *bmain, struct VFont *vfont, const bool lib_local); -bool BKE_vfont_to_curve_ex(struct Object *ob, struct Curve *cu, int mode, +bool BKE_vfont_to_curve_ex(struct Object *ob, + struct Curve *cu, + int mode, struct ListBase *r_nubase, - const wchar_t **r_text, int *r_text_len, bool *r_text_free, + const wchar_t **r_text, + int *r_text_len, + bool *r_text_free, struct CharTrans **r_chartransdata); -bool BKE_vfont_to_curve_nubase(struct Object *ob, int mode, - struct ListBase *r_nubase); +bool BKE_vfont_to_curve_nubase(struct Object *ob, int mode, struct ListBase *r_nubase); bool BKE_vfont_to_curve(struct Object *ob, int mode); int BKE_vfont_select_get(struct Object *ob, int *r_start, int *r_end); void BKE_vfont_select_clamp(struct Object *ob); void BKE_vfont_clipboard_free(void); -void BKE_vfont_clipboard_set(const wchar_t *text_buf, const struct CharInfo *info_buf, const size_t len); -void BKE_vfont_clipboard_get( - wchar_t **r_text_buf, struct CharInfo **r_info_buf, - size_t *r_len_utf8, size_t *r_len_wchar); +void BKE_vfont_clipboard_set(const wchar_t *text_buf, + const struct CharInfo *info_buf, + const size_t len); +void BKE_vfont_clipboard_get(wchar_t **r_text_buf, + struct CharInfo **r_info_buf, + size_t *r_len_utf8, + size_t *r_len_wchar); #ifdef __cplusplus } -- cgit v1.2.3