Unified · Split
| @@ -6,8 +6,8 @@ · 5 unmodified lines | |||
| 6 | typedef struct Image Image; | 6 | typedef struct Image Image; |
| 7 | 7 | ||
| 8 | struct Image { | 8 | struct Image { |
| 9 | int h; | ||
| 10 | int w; | 9 | int w; |
| 10 | int h; | ||
| 11 | u8int *b; | 11 | u8int *b; |
| 12 | }; | 12 | }; |
| 13 | 13 | ||
| @@ -129,7 +129,8 @@ main(int argc, char **argv) · 115 unmodified lines | |||
| 129 | if(im[i].b == nil) | 129 | if(im[i].b == nil) |
| 130 | sysfatal("%r"); | 130 | sysfatal("%r"); |
| 131 | }else if(ppem <= 0){ | 131 | }else if(ppem <= 0){ |
| 132 | Bprint(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component"); | 132 | Bprint(out.aux, "%d (%s):\n", i, |
| 133 | g->simple ? "simple" : (g->component ? "component" : "empty")); | ||
| 133 | print_Glyf(&out, indentΔ, o, g); | 134 | print_Glyf(&out, indentΔ, o, g); |
| 134 | } | 135 | } |
| 135 | free(g); | 136 | free(g); |
| @@ -156,7 +156,8 @@ main(int argc, char **argv) · 155 unmodified lines | |||
| 156 | if(im[i].b == NULL) | 156 | if(im[i].b == NULL) |
| 157 | errx(1, "glyph %d: %s", i, otferrstr()); | 157 | errx(1, "glyph %d: %s", i, otferrstr()); |
| 158 | }else if(ppem <= 0){ | 158 | }else if(ppem <= 0){ |
| 159 | fprintf(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component"); | 159 | fprintf(out.aux, "%d (%s):\n", i, |
| 160 | g->simple ? "simple" : (g->component ? "component" : "empty")); | ||
| 160 | print_Glyf(&out, indentΔ, o, g); | 161 | print_Glyf(&out, indentΔ, o, g); |
| 161 | } | 162 | } |
| 162 | free(g); | 163 | free(g); |