From 5b751c95f4e58c5f56b1af61c835b4537f19f43c Mon Sep 17 00:00:00 2001
From: Harley Acheson <harley.acheson@gmail.com>
Date: Wed, 25 Aug 2021 13:30:00 -0700
Subject: BLF: Remove ASCII-only Code Paths

Remove redundant code for drawing text strings that contain only ASCII.

See D12293 for much more detail.

Differential Revision: https://developer.blender.org/D12293

Reviewed by Campbell Barton
---
 source/blender/editors/space_image/image_draw.c | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'source/blender/editors/space_image')

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 92ceb00d5c0..4f66506d28b 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -196,21 +196,21 @@ void ED_image_draw_info(Scene *scene,
   BLF_color3ub(blf_mono_font, 255, 255, 255);
   SNPRINTF(str, "X:%-4d  Y:%-4d |", x, y);
   BLF_position(blf_mono_font, dx, dy, 0);
-  BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+  BLF_draw(blf_mono_font, str, sizeof(str));
   dx += BLF_width(blf_mono_font, str, sizeof(str));
 
   if (zp) {
     BLF_color3ub(blf_mono_font, 255, 255, 255);
     SNPRINTF(str, " Z:%-.4f |", 0.5f + 0.5f * (((float)*zp) / (float)0x7fffffff));
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
   }
   if (zpf) {
     BLF_color3ub(blf_mono_font, 255, 255, 255);
     SNPRINTF(str, " Z:%-.3f |", *zpf);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
   }
 
@@ -223,7 +223,7 @@ void ED_image_draw_info(Scene *scene,
     }
     BLF_color3ub(blf_mono_font, 255, 255, 255);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
   }
 
@@ -239,7 +239,7 @@ void ED_image_draw_info(Scene *scene,
       STRNCPY(str, "  R:-");
     }
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     BLF_color3ubv(blf_mono_font, green);
@@ -253,7 +253,7 @@ void ED_image_draw_info(Scene *scene,
       STRNCPY(str, "  G:-");
     }
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     BLF_color3ubv(blf_mono_font, blue);
@@ -267,7 +267,7 @@ void ED_image_draw_info(Scene *scene,
       STRNCPY(str, "  B:-");
     }
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     if (channels == 4) {
@@ -282,7 +282,7 @@ void ED_image_draw_info(Scene *scene,
         STRNCPY(str, "- ");
       }
       BLF_position(blf_mono_font, dx, dy, 0);
-      BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+      BLF_draw(blf_mono_font, str, sizeof(str));
       dx += BLF_width(blf_mono_font, str, sizeof(str));
     }
 
@@ -307,7 +307,7 @@ void ED_image_draw_info(Scene *scene,
 
       SNPRINTF(str, "  |  CM  R:%-.4f  G:%-.4f  B:%-.4f", rgba[0], rgba[1], rgba[2]);
       BLF_position(blf_mono_font, dx, dy, 0);
-      BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+      BLF_draw(blf_mono_font, str, sizeof(str));
       dx += BLF_width(blf_mono_font, str, sizeof(str));
     }
   }
@@ -429,12 +429,12 @@ void ED_image_draw_info(Scene *scene,
 
     SNPRINTF(str, "V:%-.4f", val);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     SNPRINTF(str, "   L:%-.4f", lum);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
   }
   else if (channels >= 3) {
     rgb_to_hsv(finalcol[0], finalcol[1], finalcol[2], &hue, &sat, &val);
@@ -442,22 +442,22 @@ void ED_image_draw_info(Scene *scene,
 
     SNPRINTF(str, "H:%-.4f", hue);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     SNPRINTF(str, "  S:%-.4f", sat);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     SNPRINTF(str, "  V:%-.4f", val);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
     dx += BLF_width(blf_mono_font, str, sizeof(str));
 
     SNPRINTF(str, "   L:%-.4f", lum);
     BLF_position(blf_mono_font, dx, dy, 0);
-    BLF_draw_ascii(blf_mono_font, str, sizeof(str));
+    BLF_draw(blf_mono_font, str, sizeof(str));
   }
 }
 void draw_image_sample_line(SpaceImage *sima)
-- 
cgit v1.2.3