Mercurial > octave-nkf

changeset 12539:ccd0572e5e93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gnulib:: functions as needed
author John W. Eaton <jwe@octave.org>
date Fri, 25 Mar 2011 13:37:11 -0400
parents 6a225fb7d361
children b3c158b8941c
files src/ChangeLog src/DLD-FUNCTIONS/__init_fltk__.cc
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Mar 24 16:46:34 2011 -0400
+++ b/src/ChangeLog	Fri Mar 25 13:37:11 2011 -0400
@@ -1,3 +1,8 @@
+2011-03-25  John W. Eaton  <jwe@octave.org>
+
+	* file-io.cc (Fmkstemp): Use gnulib::mkstemp.
+	* DLD-FUNCTIONS/__init_fltk__.cc (f): Use gnulib::floor.
+
 2011-03-18  Rik  <octave@nomad.inbox5.com>
 
 	* dot.cc: Improve seealso cross references in docstring.
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc	Thu Mar 24 16:46:34 2011 -0400
+++ b/src/DLD-FUNCTIONS/__init_fltk__.cc	Fri Mar 25 13:37:11 2011 -0400
@@ -443,9 +443,12 @@
           if (item != NULL)
             {
               Matrix rgb = uimenup.get_foregroundcolor_rgb ();
-              item->labelcolor(fl_rgb_color(static_cast<uchar>(floor (rgb(0)*255)),
-                                            static_cast<uchar>(floor (rgb(1)*255)),
-                                            static_cast<uchar>(floor (rgb(2)*255))));
+
+              uchar r = static_cast<uchar> (gnulib::floor (rgb (0) * 255));
+              uchar g = static_cast<uchar> (gnulib::floor (rgb (1) * 255));
+              uchar b = static_cast<uchar> (gnulib::floor (rgb (2) * 255));
+
+              item->labelcolor (fl_rgb_color (r, g, b));
             }
         }
     }