tstupid sun - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 840bb96866d382d3e4771ca8e81e1cb9aa37986c
(DIR) parent ecdecae370ea13343bbfab0f9aa712c83c2fdfb0
(HTM) Author: rsc <devnull@localhost>
Date: Sun, 25 Apr 2004 21:36:03 +0000
stupid sun
Diffstat:
M src/cmd/jpg/ico.c | 8 ++++----
M src/cmd/jpg/readppm.c | 10 +++++-----
M src/cmd/jpg/writegif.c | 7 +++++--
3 files changed, 14 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/src/cmd/jpg/ico.c b/src/cmd/jpg/ico.c
t@@ -273,9 +273,9 @@ enum
};
char *menu3str[] = {
- [Mimage] "write image",
- [Mmask] "write mask",
- [Mexit] "exit",
+ "write image",
+ "write mask",
+ "exit",
0,
};
t@@ -469,7 +469,7 @@ main(int argc, char **argv)
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);
(DIR) diff --git a/src/cmd/jpg/readppm.c b/src/cmd/jpg/readppm.c
t@@ -151,12 +151,12 @@ struct Pix {
};
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 },
};
(DIR) diff --git a/src/cmd/jpg/writegif.c b/src/cmd/jpg/writegif.c
t@@ -52,8 +52,11 @@ startgif0(Biobuf *fd, ulong chan, Rectangle r, int depth, int loopcount)
{
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: