[Emacs-diffs] /srv/bzr/emacs/trunk r107807: composite.c: use 'double' consistently

[Paul Eggert]

------------------------------------------------------------
revno: 107807
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-08 23:52:40 -0700
message:
  composite.c: use 'double' consistently
  
  * composite.c (get_composition_id): Use 'double' consistently
  instead of converting 'float' to 'double' and vice versa; this is
  easier to understand and avoids a GCC warning.
modified:
  src/ChangeLog
  src/composite.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-09 06:47:33 +0000
+++ b/src/ChangeLog     2012-04-09 06:52:40 +0000
@@ -1,3 +1,10 @@
+2012-04-09  Paul Eggert  <address@hidden>
+
+       composite.c: use 'double' consistently
+       * composite.c (get_composition_id): Use 'double' consistently
+       instead of converting 'float' to 'double' and vice versa; this is
+       easier to understand and avoids a GCC warning.
+
 2012-04-09  Glenn Morris  <address@hidden>
 
        * Makefile.in: Generate leim-list with bootstrap-emacs, in

=== modified file 'src/composite.c'
--- a/src/composite.c   2012-01-19 07:21:25 +0000
+++ b/src/composite.c   2012-04-09 06:52:40 +0000
@@ -355,7 +355,7 @@
   else
     {
       /* Rule-base composition.  */
-      float leftmost = 0.0, rightmost;
+      double leftmost = 0.0, rightmost;
 
       ch = XINT (key_contents[0]);
       rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1;
@@ -364,7 +364,7 @@
        {
          int rule, gref, nref;
          int this_width;
-         float this_left;
+         double this_left;
 
          rule = XINT (key_contents[i]);
          ch = XINT (key_contents[i + 1]);