Util function to determine number of digits from an integer
authorDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 18:52:59 +0000 (16:52 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 18:54:07 +0000 (16:54 -0200)
source/blender/blenkernel/intern/image.c
source/blender/blenlib/intern/math_base_inline.c
source/blender/editors/space_text/text_draw.c

index e3e4032..bd2373a 100644 (file)
@@ -1695,7 +1695,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
                int digits = 1;
 
                if (scene->r.efra > 9)
-                       digits = 1 + (int) log10(scene->r.efra);
+                       digits = integer_digits_i(scene->r.efra);
 
                BLI_snprintf(fmtstr, sizeof(fmtstr), do_prefix ? "Frame %%0%di" : "%%0%di", digits);
                BLI_snprintf(stamp_data->frame, sizeof(stamp_data->frame), fmtstr, scene->r.cfra);
index 9202efc..a0c13e1 100644 (file)
@@ -397,6 +397,10 @@ MINLINE int integer_digits_d(const double d)
        return (d == 0.0) ? 0 : (int)floor(log10(fabs(d))) + 1;
 }
 
+MINLINE int integer_digits_i(const int i)
+{
+       return (int)log10(i) + 1;
+}
 
 /* Internal helpers for SSE2 implementation.
  *
index 70b5fea..4eb6681 100644 (file)
@@ -594,7 +594,7 @@ static void text_update_drawcache(SpaceText *st, ARegion *ar)
                        drawcache->total_lines = 0;
 
                        if (st->showlinenrs)
-                               st->linenrs_tot = (int)floor(log10((float)nlines)) + 1;
+                               st->linenrs_tot = integer_digits_i(nlines);
 
                        while (line) {
                                if (drawcache->valid_head) { /* we're inside valid head lines */
@@ -628,7 +628,7 @@ static void text_update_drawcache(SpaceText *st, ARegion *ar)
                        nlines = BLI_listbase_count(&txt->lines);
 
                        if (st->showlinenrs)
-                               st->linenrs_tot = (int)floor(log10((float)nlines)) + 1;
+                               st->linenrs_tot = integer_digits_i(nlines);
                }
 
                drawcache->total_lines = nlines;