Mercurial > octave

diff libinterp/corefcn/txt-eng-ft.cc @ 17377:15e2ad6372f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Tweaks to remove compiler warnings. * libgui/src/find-files-model.cc(rowCount, columnCount): Eliminate unused input parameter p. * libinterp/corefcn/octave-link.cc(F__octave_link_file_dialog__): Use signed int in for loop index for comparison to octave_idx_type. * libinterp/corefcn/txt-eng-ft.cc(ft_render::visit): Initialize all of mbstate_t structure (not just first field) with memset() to 0. * libinterp/parse-tree/oct-parse.in.yy(F__parse_file__): Remove unused nargout parameter.
author Rik <rik@octave.org>
date Thu, 05 Sep 2013 10:34:09 -0700
parents 4a348443de9b
children 4f1dd8a980df
line wrap: on
line diff
--- a/libinterp/corefcn/txt-eng-ft.cc	Thu Sep 05 01:49:29 2013 -0400
+++ b/libinterp/corefcn/txt-eng-ft.cc	Thu Sep 05 10:34:09 2013 -0700
@@ -42,8 +42,8 @@
 #include "pr-output.h"
 #include "txt-eng-ft.h"
 
-// FIXME -- maybe issue at most one warning per glyph/font/size/weight
-// combination.
+// FIXME: maybe issue at most one warning per glyph/font/size/weight
+//        combination.
 
 static void
 gripe_missing_glyph (FT_ULong c)
@@ -62,10 +62,10 @@
 }
 
 #ifdef _MSC_VER
-// This is just a trick to avoid multiply symbols definition.
+// This is just a trick to avoid multiple symbol definitions.
 // PermMatrix.h contains a dllexport'ed Array<octave_idx_type>
-// that will make MSVC not to generate new instantiation and
-// use the imported one.
+// that will cause MSVC not to generate a new instantiation and
+// use the imported one instead.
 #include "PermMatrix.h"
 #endif
 
@@ -154,8 +154,7 @@
         FT_Done_FreeType (library);
 
 #if defined (HAVE_FONTCONFIG)
-      // FIXME -- Skip the call to FcFini because it can trigger the
-      // assertion
+      // FIXME: Skip the call to FcFini because it can trigger the assertion
       //
       //   octave: fccache.c:507: FcCacheFini: Assertion 'fcCacheChains[i] == ((void *)0)' failed.
       //
@@ -225,7 +224,7 @@
               FcDefaultSubstitute (pat);
               match = FcFontMatch (0, pat, &res);
 
-              // FIXME -- originally, this test also required that
+              // FIXME: originally, this test also required that
               // res != FcResultNoMatch.  Is that really needed?
               if (match)
                 {
@@ -284,8 +283,7 @@
     {
       if (face->generic.data)
         {
-          ft_key* pkey =
-            reinterpret_cast<ft_key*> (face->generic.data);
+          ft_key* pkey = reinterpret_cast<ft_key*> (face->generic.data);
 
           cache.erase (*pkey);
           delete pkey;
@@ -634,7 +632,8 @@
 
       std::string str = e.string_value ();
       size_t n = str.length (), curr = 0;
-      mbstate_t ps = { 0 };
+      mbstate_t ps;
+      memset (&ps, 0, sizeof (ps));  // Initialize state to 0.
       wchar_t wc;
 
       while (n > 0)