diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-08-14 05:36:05 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-08-14 05:36:05 +0200 |
| commit | 21b5efe9627ea59b06015f5229c069f346535704 (patch) | |
| tree | 823b9b3ddfd05cbad0cb0ec16f73af36785d0a92 | |
| parent | a8d7bbeeb343d3696ad8a5d75606c7b3729189b7 (diff) | |
| download | plan9front-21b5efe9627ea59b06015f5229c069f346535704.tar.xz | |
jpg: ignore sampling factors for grayscale as colormap1() doesnt handle it
| -rw-r--r-- | sys/src/cmd/jpg/readjpg.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/src/cmd/jpg/readjpg.c b/sys/src/cmd/jpg/readjpg.c index fd73025ec..1fe678237 100644 --- a/sys/src/cmd/jpg/readjpg.c +++ b/sys/src/cmd/jpg/readjpg.c @@ -7,7 +7,7 @@ enum { /* Constants, all preceded by byte 0xFF */ SOF =0xC0, /* Start of Frame */ - SOF2=0xC2, /* Start of Frame; progressive Huffman */ + SOF2 =0xC2, /* Start of Frame; progressive Huffman */ JPG =0xC8, /* Reserved for JPEG extensions */ DHT =0xC4, /* Define Huffman Tables */ DAC =0xCC, /* Arithmetic coding conditioning */ @@ -322,12 +322,15 @@ readslave(Header *header, int colorspace) case SOF2: header->Y = int2(b, 1); header->X = int2(b, 3); - header->Nf =b[5]; + header->Nf = b[5]; for(i=0; i<header->Nf; i++){ header->comp[i].C = b[6+3*i+0]; nibbles(b[6+3*i+1], &H, &V); if(H<=0 || V<=0) jpgerror(header, "non-positive sampling factor (Hsamp or Vsamp)"); + /* hack: colormap1() doesnt handle resampling */ + if(header->Nf == 1) + H = V = 1; header->comp[i].H = H; header->comp[i].V = V; header->comp[i].Tq = b[6+3*i+2]; |