# HG changeset patch # User kostya # Date 1238171507 0 # Node ID 931bb51f060e15d3a402446386021b4fd93fdb0b # Parent 762d7bc58fb61742924d505a34f4f6f6245415ca Merge some cases for reading raw data with different bit depths in BMP diff -r 762d7bc58fb6 -r 931bb51f060e bmp.c --- a/bmp.c Thu Mar 26 12:41:11 2009 +0000 +++ b/bmp.c Fri Mar 27 16:31:47 2009 +0000 @@ -244,6 +244,8 @@ }else{ switch(depth){ case 1: + case 8: + case 24: for(i = 0; i < avctx->height; i++){ memcpy(ptr, buf, n); buf += n; @@ -261,20 +263,6 @@ ptr += linesize; } break; - case 8: - for(i = 0; i < avctx->height; i++){ - memcpy(ptr, buf, avctx->width); - buf += n; - ptr += linesize; - } - break; - case 24: - for(i = 0; i < avctx->height; i++){ - memcpy(ptr, buf, avctx->width*(depth>>3)); - buf += n; - ptr += linesize; - } - break; case 16: for(i = 0; i < avctx->height; i++){ const uint16_t *src = (const uint16_t *) buf;