griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: minor changes to last commit.

Browse Source
This commit is contained in:
Campbell Barton
2012-08-21 10:44:10 +00:00
parent 08417318cd
commit 6a2018fe13
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_packedFile.h
View File

@@ -43,7 +43,7 @@ struct ReportList;
struct VFont;
/* pack */
struct PackedFile *dupPackedFileMemory(const struct PackedFile *pf_src);
struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
struct PackedFile *newPackedFile(struct ReportList *reports, const char *filename, const char *relabase);
struct PackedFile *newPackedFileMemory(void *mem, int memlen);

13
source/blender/blenkernel/intern/font.c
View File

@@ -60,7 +60,6 @@
#include "BKE_curve.h"
#include "BKE_displist.h"
//static ListBase ttfdata = {NULL, NULL};
/* The vfont code */
void BKE_vfont_free_data(struct VFont *vfont)
@@ -149,7 +148,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont)
/* We need to copy a tmp font to memory unless it is already there */
if (vfont->temp_pf == NULL) {
vfont->temp_pf = dupPackedFileMemory(pf);
vfont->temp_pf = dupPackedFile(pf);
}
}
else {
@@ -237,8 +236,6 @@ VFont *BKE_vfont_load(Main *bmain, const char *name)
if (!vfont || vfont->packedfile != pf) {
freePackedFile(pf);
}
//XXX waitcursor(0);
}
return vfont;
@@ -248,13 +245,13 @@ static VFont *which_vfont(Curve *cu, CharInfo *info)
{
switch (info->flag & (CU_CHINFO_BOLD | CU_CHINFO_ITALIC)) {
case CU_CHINFO_BOLD:
if (cu->vfontb) return(cu->vfontb); else return(cu->vfont);
return cu->vfontb ? cu->vfontb : cu->vfont;
case CU_CHINFO_ITALIC:
if (cu->vfonti) return(cu->vfonti); else return(cu->vfont);
return cu->vfonti ? cu->vfonti : cu->vfont;
case (CU_CHINFO_BOLD | CU_CHINFO_ITALIC):
if (cu->vfontbi) return(cu->vfontbi); else return(cu->vfont);
return cu->vfontbi ? cu->vfontbi : cu->vfont;
default:
return(cu->vfont);
return cu->vfont;
}
}

2
source/blender/blenkernel/intern/packedFile.c
View File

@@ -159,7 +159,7 @@ void freePackedFile(PackedFile *pf)
printf("freePackedFile: Trying to free a NULL pointer\n");
}
PackedFile *dupPackedFileMemory(const PackedFile *pf_src)
PackedFile *dupPackedFile(const PackedFile *pf_src)
{
PackedFile *pf_dst;