|
 |
724863 |
--- ttmkfdir-3.0.9/encoding.l~ 2005-08-03 19:33:07.000000000 +0900
|
|
|
724863 |
+++ ttmkfdir-3.0.9/encoding.l 2005-08-03 21:52:15.000000000 +0900
|
|
|
724863 |
@@ -115,7 +115,7 @@
|
|
|
724863 |
}
|
|
|
724863 |
|
|
|
724863 |
/* avoid a crash issue */
|
|
|
724863 |
- if (cur_enc->size < i2)
|
|
|
724863 |
+ if ((int) (cur_enc->size) < i2)
|
|
|
724863 |
cur_enc->size = i2;
|
|
|
724863 |
if (!is_created_map)
|
|
|
724863 |
create_mapping();
|
|
|
724863 |
@@ -127,8 +127,8 @@
|
|
|
724863 |
}
|
|
|
724863 |
|
|
|
724863 |
<INSIDE_MAP_BLOCK>{NUMBER}({WHITESPACES}{NUMBER}){0,2} {
|
|
|
724863 |
- unsigned int start_range;
|
|
|
724863 |
- int numbers[3], i = 0, end_range, target, res;
|
|
|
724863 |
+ unsigned int start_range = 0, i = 0, end_range = 0;
|
|
|
724863 |
+ int numbers[3], target = 0, res;
|
|
|
724863 |
char *startptr;
|
|
|
724863 |
char *endptr = yytext;
|
|
|
724863 |
|
|
|
724863 |
--- ttmkfdir-3.0.9/commandline.cpp~ 2002-12-09 17:29:11.000000000 +0900
|
|
|
724863 |
+++ ttmkfdir-3.0.9/commandline.cpp 2005-08-03 21:12:40.000000000 +0900
|
|
|
724863 |
@@ -1,6 +1,8 @@
|
|
|
724863 |
#include <cstdlib>
|
|
|
724863 |
|
|
|
724863 |
+#ifndef _GNU_SOURCE
|
|
|
724863 |
#define _GNU_SOURCE
|
|
|
724863 |
+#endif
|
|
|
724863 |
#include <getopt.h>
|
|
|
724863 |
|
|
|
724863 |
#include "commandline.h"
|
|
|
724863 |
--- ttmkfdir-3.0.9/ttmkfdir.cpp~ 2003-01-20 08:33:11.000000000 +0900
|
|
|
724863 |
+++ ttmkfdir-3.0.9/ttmkfdir.cpp 2005-08-03 21:08:43.000000000 +0900
|
|
|
724863 |
@@ -76,7 +76,7 @@
|
|
|
724863 |
return 1;
|
|
|
724863 |
}
|
|
|
724863 |
|
|
|
724863 |
- fprintf (output, "%d\n", fontdir.size ());
|
|
|
724863 |
+ fprintf (output, "%d\n", (int)(fontdir.size ()));
|
|
|
724863 |
|
|
|
724863 |
for (vector<string>::const_iterator i = fontdir.begin (); i != fontdir.end (); i++) {
|
|
|
724863 |
fprintf (output, "%s\n", i->c_str ());
|
|
|
724863 |
--- ttmkfdir-3.0.9/ttf.cpp~ 2005-08-03 19:33:07.000000000 +0900
|
|
|
724863 |
+++ ttmkfdir-3.0.9/ttf.cpp 2005-08-03 21:31:48.000000000 +0900
|
|
|
724863 |
@@ -533,7 +533,7 @@
|
|
|
724863 |
const char *
|
|
|
724863 |
Face::Weight (void) const
|
|
|
724863 |
{
|
|
|
724863 |
- const char *result;
|
|
|
724863 |
+ const char *result = NULL;
|
|
|
724863 |
|
|
|
724863 |
if (cmdline::instance()->option ("panose") && ((result = PanoseWeight ()) != 0)) {
|
|
|
724863 |
return result;
|
|
|
724863 |
@@ -614,7 +614,7 @@
|
|
|
724863 |
const char *
|
|
|
724863 |
Face::Width (void) const
|
|
|
724863 |
{
|
|
|
724863 |
- const char *result;
|
|
|
724863 |
+ const char *result = NULL;
|
|
|
724863 |
|
|
|
724863 |
if (cmdline::instance()->option ("panose") && ((result = PanoseWidth ()) != 0)) {
|
|
|
724863 |
return result;
|
|
|
724863 |
--- ttmkfdir-3.0.9/encoding.cpp~ 2005-08-03 19:33:07.000000000 +0900
|
|
|
724863 |
+++ ttmkfdir-3.0.9/encoding.cpp 2005-08-03 21:31:44.000000000 +0900
|
|
|
724863 |
@@ -121,7 +121,7 @@
|
|
|
724863 |
|
|
|
724863 |
NumericMapping *m = new NumericMapping (size, b->mapdata.platform, b->mapdata.encoding);
|
|
|
724863 |
|
|
|
724863 |
- for (int i = 0; i < size; i++)
|
|
|
724863 |
+ for (unsigned int i = 0; i < size; i++)
|
|
|
724863 |
(*m)[i] = b->mapdata.mappingtable[i];
|
|
|
724863 |
|
|
|
724863 |
AddMapping (m);
|