commit - ecdecae370ea13343bbfab0f9aa712c83c2fdfb0
commit + 840bb96866d382d3e4771ca8e81e1cb9aa37986c
blob - 31806afb869b7166e1a731fdc1eacb274573a8aa
blob + 3a275e655ceff88a2f9a0b64ddbb6a64e613b478
--- src/cmd/jpg/ico.c
+++ src/cmd/jpg/ico.c
};
char *menu3str[] = {
- [Mimage] "write image",
- [Mmask] "write mask",
- [Mexit] "exit",
+ "write image",
+ "write mask",
+ "exit",
0,
};
if(Bgetheader(&in, &h) < 0)
sysfatal("reading header: %r");
- initdraw(nil, nil, "ico");
+ initdraw(0, nil, "ico");
background = allocimage(display, Rect(0, 0, 1, 1), screen->chan, 1, (128<<24)|(128<<16)|(128<<8)|0xFF);
einit(Emouse|Ekeyboard);
blob - 28b7f4ea0978142831ba5382b917932a35150d8d
blob + d9b542939fdf937cd50636f37e1f0c1ba5f6f967
--- src/cmd/jpg/readppm.c
+++ src/cmd/jpg/readppm.c
};
static Pix pix[] = {
- { '1', 1, Bgetdecimalbit, 1, CY, 1, nil }, /* portable bitmap */
+ { '1', 1, Bgetdecimalbit, 1, CY, 1, 0 }, /* portable bitmap */
{ '4', 1, Bgetbit, 1, CY, 1, Bflushbit }, /* raw portable bitmap */
- { '2', 0, Bgetint, 1, CY, 0, nil }, /* portable greymap */
- { '5', 0, Bgetc, 1, CY, 0, nil }, /* raw portable greymap */
- { '3', 0, Bgetint, 3, CRGB, 0, nil }, /* portable pixmap */
- { '6', 0, Bgetc, 3, CRGB, 0, nil }, /* raw portable pixmap */
+ { '2', 0, Bgetint, 1, CY, 0, 0 }, /* portable greymap */
+ { '5', 0, Bgetc, 1, CY, 0, 0 }, /* raw portable greymap */
+ { '3', 0, Bgetint, 3, CRGB, 0, 0 }, /* portable pixmap */
+ { '6', 0, Bgetc, 3, CRGB, 0, 0 }, /* raw portable pixmap */
{ 0 },
};
blob - 16402ef8e14f55283dfb6677801ed8b5f6539890
blob + 4bb018b3d70ef016312df21706c9835421c8e59d
--- src/cmd/jpg/writegif.c
+++ src/cmd/jpg/writegif.c
{
int i;
- for(i=0; i<nelem(tbl); i++)
- tbl[i] = (Entry){i, -1, i, nil};
+ for(i=0; i<nelem(tbl); i++){
+ tbl[i].index = i;
+ tbl[i].prefix = -1;
+ tbl[i].exten = i;
+ }
switch(chan){
case GREY1: