Mercurial > libavcodec.hg

comparison tiff.c @ 5257:f2eaf5afe6ae libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kill warnings
author mru
date Sun, 08 Jul 2007 23:15:04 +0000
parents 2b72f9bc4f06
children d6957da94689
comparison
equal deleted inserted replaced
5256:f540f39e1472 5257:f2eaf5afe6ae
153 static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t *end_buf, AVFrame *pic) 153 static int tiff_decode_tag(TiffContext *s, uint8_t *start, uint8_t *buf, uint8_t *end_buf, AVFrame *pic)
154 { 154 {
155 int tag, type, count, off, value = 0; 155 int tag, type, count, off, value = 0;
156 uint8_t *src, *dst; 156 uint8_t *src, *dst;
157 int i, j, ssize, soff, stride; 157 int i, j, ssize, soff, stride;
158 int *pal, *rp, *gp, *bp; 158 int *pal;
159 uint8_t *rp, *gp, *bp;
159 160
160 tag = tget_short(&buf, s->le); 161 tag = tget_short(&buf, s->le);
161 type = tget_short(&buf, s->le); 162 type = tget_short(&buf, s->le);
162 count = tget_long(&buf, s->le); 163 count = tget_long(&buf, s->le);
163 off = tget_long(&buf, s->le); 164 off = tget_long(&buf, s->le);
242 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); 243 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
243 return -1; 244 return -1;
244 } 245 }
245 if(s->bpp == 8){ 246 if(s->bpp == 8){
246 /* make default grayscale pal */ 247 /* make default grayscale pal */
247 pal = s->picture.data[1]; 248 pal = (int *) s->picture.data[1];
248 for(i = 0; i < 256; i++) 249 for(i = 0; i < 256; i++)
249 pal[i] = i * 0x010101; 250 pal[i] = i * 0x010101;
250 } 251 }
251 break; 252 break;
252 case TIFF_COMPR: 253 case TIFF_COMPR:
375 case TIFF_PAL: 376 case TIFF_PAL:
376 if(s->avctx->pix_fmt != PIX_FMT_PAL8){ 377 if(s->avctx->pix_fmt != PIX_FMT_PAL8){
377 av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n"); 378 av_log(s->avctx, AV_LOG_ERROR, "Palette met but this is not palettized format\n");
378 return -1; 379 return -1;
379 } 380 }
380 pal = s->picture.data[1]; 381 pal = (int *) s->picture.data[1];
381 off = type_sizes[type]; 382 off = type_sizes[type];
382 rp = buf; 383 rp = buf;
383 gp = buf + count / 3 * off; 384 gp = buf + count / 3 * off;
384 bp = buf + count / 3 * off * 2; 385 bp = buf + count / 3 * off * 2;
385 off = (type_sizes[type] - 1) << 3; 386 off = (type_sizes[type] - 1) << 3;