summaryrefslogtreecommitdiff
path: root/fonts/fontforge/patches/patch-ag
blob: 888f0a5605e3f5649fd6ac00a10edda58357d1c3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
$NetBSD: patch-ag,v 1.1 2006/04/05 07:03:25 adam Exp $

--- fontforge/parsettf.c.orig	2006-04-04 11:38:32.000000000 +0200
+++ fontforge/parsettf.c
@@ -4254,7 +4254,7 @@ return;
 
 static int readttf(FILE *ttf, struct ttfinfo *info, char *filename) {
     char *oldloc;
-    int i;
+    int i, choice;
 
 #if !defined(FONTFORGE_CONFIG_NO_WINDOWING_UI)
     gwwv_progress_change_stages(3);
@@ -4283,12 +4283,12 @@ return( 0 );
 	buts[3] = NULL;
 #if defined(FONTFORGE_CONFIG_GDRAW)
 	buts[2] = _("_Cancel");
-	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
 #elif defined(FONTFORGE_CONFIG_GTK)
 	buts[2] = GTK_STOCK_CANCEL;
-	int choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
+	choice = gwwv_ask(_("Pick a font, any font..."),(const char **) buts,0,2,_("This font contains both a TrueType 'glyf' table and an OpenType 'CFF ' table. FontForge can only deal with one at a time, please pick which one you want to use"));
 #else
-	int choice = 0;
+	choice = 0;
 #endif
 	if ( choice==2 ) {
 	    setlocale(LC_NUMERIC,oldloc);