1 files changed, 13 insertions, 68 deletions

diff --git a/source/blender/imbuf/intern/thumbs_font.c b/source/blender/imbuf/intern/thumbs_font.c
index 65848bfb55e..c3ed81698d9 100644
--- a/source/blender/imbuf/intern/thumbs_font.c
+++ b/source/blender/imbuf/intern/thumbs_font.c
@@ -6,94 +6,39 @@
 
 #include "BLI_fileops.h"
 #include "BLI_hash_md5.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "IMB_thumbs.h"
+#include "IMB_thumbs.h" /* own include. */
 
 /* XXX, bad level call */
 #include "../../blenfont/BLF_api.h"
-#include "../../blentranslation/BLT_translation.h"
 
-#define THUMB_TXT_ITEMS \
-  N_("AaBbCc"), N_("The quick"), N_("brown fox"), N_("jumps over"), N_("the lazy dog"),
+/* Only change if we need to update the previews in the on-disk cache. */
+#define FONT_THUMB_VERSION "1.0.0"
 
-static const char *thumb_str[] = {THUMB_TXT_ITEMS};
-
-static const char *i18n_thumb_str[] = {THUMB_TXT_ITEMS};
-
-#undef THUMB_TXT_ITEMS
-
-void IMB_thumb_clear_translations(void)
-{
-  for (int i = ARRAY_SIZE(thumb_str); i-- > 0;) {
-    i18n_thumb_str[i] = NULL;
-  }
-}
-
-void IMB_thumb_ensure_translations(void)
-{
-  for (int i = ARRAY_SIZE(thumb_str); i-- > 0;) {
-    i18n_thumb_str[i] = BLT_translate_do(BLT_I18NCONTEXT_DEFAULT, thumb_str[i]);
-  }
-}
-
-struct ImBuf *IMB_thumb_load_font(const char *filepath, uint x, uint y)
+struct ImBuf *IMB_thumb_load_font(const char *filename, uint x, uint y)
 {
-  const int font_size = y / 4;
+  struct ImBuf *ibuf = IMB_allocImBuf(x, y, 32, IB_rect | IB_metadata);
 
-  struct ImBuf *ibuf;
-  float font_color[4];
+  /* fill with white and zero alpha */
+  const float col[4] = {1.0f, 1.0f, 1.0f, 0.0f};
+  IMB_rectfill(ibuf, col);
 
-  /* create a white image (theme color is used for drawing) */
-  font_color[0] = font_color[1] = font_color[2] = 1.0f;
-
-  /* fill with zero alpha */
-  font_color[3] = 0.0f;
-
-  ibuf = IMB_allocImBuf(x, y, 32, IB_rect | IB_metadata);
-  IMB_rectfill(ibuf, font_color);
-
-  /* draw with full alpha */
-  font_color[3] = 1.0f;
-
-  BLF_thumb_preview(filepath,
-                    thumb_str,
-                    i18n_thumb_str,
-                    ARRAY_SIZE(thumb_str),
-                    font_color,
-                    font_size,
-                    (uchar *)ibuf->rect,
-                    ibuf->x,
-                    ibuf->y,
-                    ibuf->channels);
+  if (!BLF_thumb_preview(filename, (uchar *)ibuf->rect, ibuf->x, ibuf->y, ibuf->channels)) {
+    IMB_freeImBuf(ibuf);
+    ibuf = NULL;
+  }
 
   return ibuf;
 }
 
 bool IMB_thumb_load_font_get_hash(char *r_hash)
 {
-  char buf[1024];
-  char *str = buf;
-  size_t len = 0;
-
-  int draw_str_lines = ARRAY_SIZE(thumb_str);
-  int i;
-
   uchar digest[16];
-
-  len += BLI_strncpy_rlen(str + len, THUMB_DEFAULT_HASH, sizeof(buf) - len);
-
-  for (i = 0; (i < draw_str_lines) && (len < sizeof(buf)); i++) {
-    len += BLI_strncpy_rlen(str + len,
-                            i18n_thumb_str[i] != NULL ? i18n_thumb_str[i] : thumb_str[i],
-                            sizeof(buf) - len);
-  }
-
-  BLI_hash_md5_buffer(str, len, digest);
+  BLI_hash_md5_buffer(FONT_THUMB_VERSION, sizeof(FONT_THUMB_VERSION), digest);
   r_hash[0] = '\0';
   BLI_hash_md5_to_hexdigest(digest, r_hash);