Permalink
Browse files

Merge branch 'master' of https://github.com/fontforge/fontforge

  • Loading branch information...
2 parents badee5a + 1f1795a commit cd342b904fe72acc5647862700b7fc2a52676ba1 @davelab6 davelab6 committed Feb 21, 2013
Showing with 12 additions and 6 deletions.
  1. +3 −2 fontforge/pixmaps/tango/resources
  2. +9 −4 gutils/gimagereadxbm.c
@@ -175,13 +175,14 @@ Gdraw.GMatrixEdit.TitleBG: #a09f9e
Gdraw.GMatrixEdit.TitleDivider: #757371
Gdraw.GMatrixEdit.TitleFG: #222222
Gdraw.GMatrixEdit.TitleFont: 700 8pt dejavu sans
-Gdraw.GMenu.Box.BorderOuter: False
+Gdraw.GMenu.Box.BorderOuter: True
+Gdraw.GMenu.Box.BorderOuterCol: #dedede
Gdraw.GMenu.Box.BorderShape: rect
Gdraw.GMenu.Box.NormalBackground: #ffffff
Gdraw.GMenu.Box.Padding: 3
Gdraw.GMenu.Font: 400 10pt Cantarell,sans,clearlyu,unifont
Gdraw.GMenu.MacIcons: False
-Gdraw.GMenuBar.Box.ActiveBorder: #ffffff
+Gdraw.GMenuBar.Box.ActiveBorder: #ededed
Gdraw.GMenuBar.Box.BorderInner: False
Gdraw.GMenuBar.Box.BorderInnerCol: #edeceb
Gdraw.GMenuBar.Box.BorderOuter: False
@@ -100,16 +100,21 @@ GImage *GImageReadXbm(char * filename) {
for ( i=0; i<height; ++i ) {
scanline = base->data + i*base->bytes_per_line;
for ( j=0; j<base->bytes_per_line; ++j ) {
- if ( (fscanf(file," 0x%x",(unsigned *) &pixels))!=1 )
+ if ( fscanf(file," 0x%x",(unsigned *) &pixels)!=1 )
goto errorGImageReadXbm;
*scanline++ = ConvertXbmByte(pixels);
if ( l>8 && j+1<base->bytes_per_line ) {
*scanline++ = ConvertXbmByte(pixels>>8);
++j;
}
- //if ( l>16 && j+1<base->bytes_per_line ) {
- //TODO:implement 32bit long (If such an xbm format exists)
- //}
+ if ( l>16 && j+1<base->bytes_per_line ) {
+ *scanline++ = ConvertXbmByte(pixels>>16);
+ ++j;
+ if ( j+1<base->bytes_per_line ) {
+ *scanline++ = ConvertXbmByte(pixels>>24);
+ ++j;
+ }
+ }
fscanf(file,",");
}
}

0 comments on commit cd342b9

Please sign in to comment.