tighten up some boundary cases

fontforge · Apr 11, 2013 · 20bcd11 · 20bcd11
1 parent c3af61f
commit 20bcd11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fontforge/fontviewbase.c b/fontforge/fontviewbase.c
@@ -1475,13 +1475,13 @@ void FVRemoveUnused(FontViewBase *fv) {
     int gid, i;
     int flags = -1;
 
-    for ( i=map->enccount-1; i>=0 && ((gid=map->map[i])==-1 || !SCWorthOutputting(sf->glyphs[gid]));
+    for ( i=map->enccount-1;
+            i>=map->enc->char_cnt &&
+                ((gid=map->map[i])==-1 || !SCWorthOutputting(sf->glyphs[gid]));
 	    --i ) {
 	if ( gid!=-1 )
 	    SFRemoveGlyph(sf,sf->glyphs[gid],&flags);
 	map->enccount = i;
-	if ( map->enccount==map->enc->char_cnt )
-	    break;
     }
     /* We reduced the encoding, so don't really need to reallocate the selection */
     /*  array. It's just bigger than it needs to be. */

diff --git a/fontforge/sfd.c b/fontforge/sfd.c
@@ -8042,7 +8042,7 @@ exit( 1 );
 	} else if ( strmatch(tok,"BeginChars:")==0 ) {
 	    int charcnt;
 	    getint(sfd,&charcnt);
-	    if (charcnt<enc->char_cnt && enc->char_cnt>0) {
+	    if (charcnt<enc->char_cnt) {
 		IError("SFD file specifies too few slots for its encoding.\n" );
 exit( 1 );
 	    }