Revision: 49540
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49540
Author: campbellbarton
Date: 2012-08-03 22:12:57 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
code cleanup:
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0) with
(BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/BKE_font.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_vfont.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-08-03
22:12:57 UTC (rev 49540)
@@ -310,7 +310,7 @@
/* make sure the name of layer at index is unique */
void CustomData_set_layer_unique_name(struct CustomData *data, int index);
-void CustomData_validate_layer_name(const struct CustomData *data, int type,
char *name, char *outname);
+void CustomData_validate_layer_name(const struct CustomData *data, int type,
const char *name, char *outname);
/* for file reading compatibility, returns false if the layer was freed,
* only after this test passes, layer->data should be assigned */
Modified: trunk/blender/source/blender/blenkernel/BKE_font.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_font.h 2012-08-03 20:56:04 UTC
(rev 49539)
+++ trunk/blender/source/blender/blenkernel/BKE_font.h 2012-08-03 22:12:57 UTC
(rev 49540)
@@ -71,9 +71,10 @@
} EditFont;
+int BKE_vfont_is_builtin(struct VFont *vfont);
void BKE_vfont_builtin_register(void *mem, int size);
-void BKE_vfont_free_data(struct VFont *vf);
+void BKE_vfont_free_data(struct VFont *vfont);
void BKE_vfont_free(struct VFont *sc);
void BKE_vfont_free_global_ttf(void);
struct VFont *BKE_vfont_builtin_get(void);
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-03
22:12:57 UTC (rev 49540)
@@ -2793,7 +2793,7 @@
BLI_uniquename_cb(customdata_unique_check, &data_arg,
typeInfo->defaultname, '.', nlayer->name, sizeof(nlayer->name));
}
-void CustomData_validate_layer_name(const CustomData *data, int type, char
*name, char *outname)
+void CustomData_validate_layer_name(const CustomData *data, int type, const
char *name, char *outname)
{
int index = -1;
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-03
22:12:57 UTC (rev 49540)
@@ -64,11 +64,11 @@
/* The vfont code */
-void BKE_vfont_free_data(struct VFont *vf)
+void BKE_vfont_free_data(struct VFont *vfont)
{
- if (vf->data) {
- while (vf->data->characters.first) {
- VChar *che = vf->data->characters.first;
+ if (vfont->data) {
+ while (vfont->data->characters.first) {
+ VChar *che = vfont->data->characters.first;
while (che->nurbsbase.first) {
Nurb *nu = che->nurbsbase.first;
@@ -76,14 +76,14 @@
BLI_freelinkN(&che->nurbsbase, nu);
}
- BLI_freelinkN(&vf->data->characters, che);
+ BLI_freelinkN(&vfont->data->characters, che);
}
- MEM_freeN(vf->data);
- vf->data = NULL;
+ MEM_freeN(vfont->data);
+ vfont->data = NULL;
}
- BKE_vfont_tmpfont_remove(vf);
+ BKE_vfont_tmpfont_remove(vfont);
}
void BKE_vfont_free(struct VFont *vf)
@@ -101,6 +101,11 @@
static void *builtin_font_data = NULL;
static int builtin_font_size = 0;
+int BKE_vfont_is_builtin(struct VFont *vfont)
+{
+ return (strcmp(vfont->name, FO_BUILTIN_NAME) == 0);
+}
+
void BKE_vfont_builtin_register(void *mem, int size)
{
builtin_font_data = mem;
@@ -185,7 +190,7 @@
if (!vfont->data) {
PackedFile *pf;
- if (strcmp(vfont->name, FO_BUILTIN_NAME) == 0) {
+ if (BKE_vfont_is_builtin(vfont)) {
pf = get_builtin_packedfile();
}
else {
@@ -324,11 +329,13 @@
VFont *BKE_vfont_builtin_get(void)
{
- VFont *vf;
+ VFont *vfont;
- for (vf = G.main->vfont.first; vf; vf = vf->id.next)
- if (strcmp(vf->name, FO_BUILTIN_NAME) == 0)
- return vf;
+ for (vfont = G.main->vfont.first; vfont; vfont = vfont->id.next) {
+ if (BKE_vfont_is_builtin(vfont)) {
+ return vfont;
+ }
+ }
return BKE_vfont_load(G.main, FO_BUILTIN_NAME);
}
@@ -663,10 +670,10 @@
/*
* The character wasn't in the current curve base so load it
- * But if the font is FO_BUILTIN_NAME then do not try loading
since
+ * But if the font is built-in then do not try loading since
* whole font is in the memory already
*/
- if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME)) {
+ if (che == NULL && BKE_vfont_is_builtin(vfont) == FALSE) {
BLI_vfontchar_from_freetypefont(vfont, ascii);
}
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2012-08-03
22:12:57 UTC (rev 49540)
@@ -50,13 +50,14 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
-#include "BKE_utildefines.h"
+#include "BKE_font.h"
#include "BKE_global.h"
+#include "BKE_image.h"
#include "BKE_main.h"
-#include "BKE_sound.h"
-#include "BKE_image.h"
#include "BKE_packedFile.h"
#include "BKE_report.h"
+#include "BKE_sound.h"
+#include "BKE_utildefines.h"
#ifdef _WIN32
#define open _open
@@ -219,7 +220,7 @@
void packAll(Main *bmain, ReportList *reports)
{
Image *ima;
- VFont *vf;
+ VFont *vfont;
bSound *sound;
for (ima = bmain->image.first; ima; ima = ima->id.next) {
@@ -233,9 +234,9 @@
}
}
- for (vf = bmain->vfont.first; vf; vf = vf->id.next)
- if (vf->packedfile == NULL && vf->id.lib == NULL &&
strcmp(vf->name, FO_BUILTIN_NAME) != 0)
- vf->packedfile = newPackedFile(reports, vf->name,
bmain->name);
+ for (vfont = bmain->vfont.first; vfont; vfont = vfont->id.next)
+ if (vfont->packedfile == NULL && vfont->id.lib == NULL &&
BKE_vfont_is_builtin(vfont) == FALSE)
+ vfont->packedfile = newPackedFile(reports, vfont->name,
bmain->name);
for (sound = bmain->sound.first; sound; sound = sound->id.next)
if (sound->packedfile == NULL && sound->id.lib == NULL)
Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c 2012-08-03 20:56:04 UTC
(rev 49539)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c 2012-08-03 22:12:57 UTC
(rev 49540)
@@ -73,6 +73,7 @@
#include "BLI_bpath.h"
#include "BLI_utildefines.h"
+#include "BKE_font.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_report.h"
@@ -484,9 +485,9 @@
break;
case ID_VF:
{
- VFont *vf = (VFont *)id;
- if (vf->packedfile == NULL || (flag &
BLI_BPATH_TRAVERSE_SKIP_PACKED) == 0) {
- if (strcmp(vf->name, FO_BUILTIN_NAME) != 0) {
+ VFont *vfont = (VFont *)id;
+ if (vfont->packedfile == NULL || (flag &
BLI_BPATH_TRAVERSE_SKIP_PACKED) == 0) {
+ if (BKE_vfont_is_builtin(vfont) == FALSE) {
rewrite_path_fixed(((VFont *)id)->name,
visit_cb, absbase, bpath_user_data);
}
}
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2012-08-03
22:12:57 UTC (rev 49540)
@@ -1665,7 +1665,7 @@
static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
- VFont *font = NULL;
+ VFont *vfont = NULL;
char *path;
PointerRNA idptr;
@@ -1678,10 +1678,10 @@
if (pprop->prop) {
idptr = RNA_property_pointer_get((PointerRNA *)pprop,
pprop->prop);
- font = idptr.id.data;
+ vfont = idptr.id.data;
}
- path = (font && strcmp(font->name, FO_BUILTIN_NAME) != 0) ? font->name
: U.fontdir;
+ path = (vfont && !BKE_vfont_is_builtin(vfont)) ? vfont->name :
U.fontdir;
if (RNA_struct_property_is_set(op->ptr, "filepath"))
return font_open_exec(C, op);
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c
2012-08-03 20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c
2012-08-03 22:12:57 UTC (rev 49540)
@@ -479,7 +479,7 @@
int charmax = G.charmax;
/* FO_BUILTIN_NAME font in use. There are TTF FO_BUILTIN_NAME and
non-TTF FO_BUILTIN_NAME fonts */
- if (!strcmp(G.selfont->name, FO_BUILTIN_NAME)) {
+ if (BKE_vfont_is_builtin(G.selfont)) {
if (G.ui_international == TRUE) {
charmax = 0xff;
}
@@ -508,7 +508,7 @@
cs = G.charstart;
/* Set the font, in case it is not FO_BUILTIN_NAME font */
- if (G.selfont && strcmp(G.selfont->name, FO_BUILTIN_NAME)) {
+ if (G.selfont && BKE_vfont_is_builtin(G.selfont) == FALSE) {
/* Is the font file packed, if so then use the packed file */
if (G.selfont->packedfile) {
pf = G.selfont->packedfile;
@@ -559,7 +559,7 @@
/* Set the font to be either unicode or FO_BUILTIN_NAME
*/
wstr[0] = cs;
- if (strcmp(G.selfont->name, FO_BUILTIN_NAME)) {
+ if (BKE_vfont_is_builtin(G.selfont) == FALSE) {
BLI_strncpy_wchar_as_utf8((char *)ustr,
(wchar_t *)wstr, sizeof(ustr));
}
else {
@@ -572,8 +572,8 @@
}
}
- if ((G.selfont && strcmp(G.selfont->name,
FO_BUILTIN_NAME)) ||
- (G.selfont && !strcmp(G.selfont->name,
FO_BUILTIN_NAME) && G.ui_international == TRUE))
+ if ((G.selfont && (BKE_vfont_is_builtin(G.selfont) ==
FALSE)) ||
+ (G.selfont && (BKE_vfont_is_builtin(G.selfont) ==
TRUE) && G.ui_international == TRUE))
{
float wid;
float llx, lly, llz, urx, ury, urz;
Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c 2012-08-03
20:56:04 UTC (rev 49539)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c 2012-08-03
22:12:57 UTC (rev 49540)
@@ -109,12 +109,12 @@
ID *id = (ID *)ptr->data;
if (GS(id->name) == ID_VF) {
- VFont *vf = (VFont *)id;
- if (strcmp(vf->name, FO_BUILTIN_NAME) == 0)
- return 0;
+ VFont *vfont = (VFont *)id;
+ if (BKE_vfont_is_builtin(vfont))
+ return FALSE;
}
- return 1;
+ return TRUE;
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
