Page MenuHome
Differential D4277 Diff 13398 source/blender/blenfont/intern/blf_font.c

Changeset View

Standalone View

View Options

source/blender/blenfont/intern/blf_font.c

Context not available.
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_rect.h" #include "BLI_rect.h"
#include "BLI_strict_flags.h"
campbellbartonUnsubmitted
Not Done
Inline Actions

Don't re-order headers, it's unrelated to your patch and causes the patch to fail here.

source/blender/gpu/GPU_vertex_buffer.h:117:35: error: conversion from 'long int' to 'uint' {aka 'unsigned int'} may change value [-Werror=conversion]
  return ((a->data - a->data_init) / a->stride);
         ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
cc1: all warnings being treated as errors
campbellbarton: Don't re-order headers, it's unrelated to your patch and causes the patch to fail here. ```…
#include "BLI_string.h" #include "BLI_string.h"
#include "BLI_string_utf8.h" #include "BLI_string_utf8.h"
#include "BLI_threads.h" #include "BLI_threads.h"
Context not available.
#include "blf_internal_types.h" #include "blf_internal_types.h"
#include "blf_internal.h" #include "blf_internal.h"
#include "BLI_strict_flags.h" #include "CLG_log.h"
#ifdef WIN32 #ifdef WIN32
# define FT_New_Face FT_New_Face__win32_compat # define FT_New_Face FT_New_Face__win32_compat
#endif #endif
static CLG_LogRef LOG = { "blf.font" };
/* Batching buffer for drawing. */ /* Batching buffer for drawing. */
BatchBLF g_batch; BatchBLF g_batch;
Context not available.
err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi); err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi);
if (err) { if (err) {
/* FIXME: here we can go through the fixed size and choice a close one */ /* FIXME: here we can go through the fixed size and choice a close one */
printf("The current font don't support the size, %u and dpi, %u\n", size, dpi); CLOG_ERROR(&LOG, "Font '%s' doesn't support the size, %u and dpi, %u", font->name, size, dpi);
return; return;
} }
Context not available.
err = FT_Select_Charmap(font->face, ft_encoding_unicode); err = FT_Select_Charmap(font->face, ft_encoding_unicode);
if (err) { if (err) {
printf("Can't set the unicode character map!\n"); CLOG_ERROR(&LOG, "Can't set the unicode character map!");
FT_Done_Face(font->face); FT_Done_Face(font->face);
MEM_freeN(font); MEM_freeN(font);
return NULL; return NULL;
Context not available.
if (mfile) { if (mfile) {
err = FT_Attach_File(font->face, mfile); err = FT_Attach_File(font->face, mfile);
if (err) { if (err) {
fprintf(stderr, "FT_Attach_File failed to load '%s' with error %d\n", filename, (int)err); CLOG_ERROR(&LOG, "failed to load '%s' with error %d", filename, (int)err);
} }
MEM_freeN(mfile); MEM_freeN(mfile);
} }
Context not available.
err = FT_Select_Charmap(font->face, ft_encoding_unicode); err = FT_Select_Charmap(font->face, ft_encoding_unicode);
if (err) { if (err) {
printf("Can't set the unicode character map!\n"); CLOG_ERROR(&LOG, "Can't set the unicode character map!");
FT_Done_Face(font->face); FT_Done_Face(font->face);
MEM_freeN(font); MEM_freeN(font);
return NULL; return NULL;
Context not available.