diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-12-23 16:27:24 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-12-23 16:27:24 +0000 |
commit | d1cfc0855275b55794810162e7ce04a1e16d5188 (patch) | |
tree | 2e2626ee0e4738e8d6b6624c2d7fafe506b3dbfb /Build/source/libs/gd/libgd-src/src/gd_bmp.c | |
parent | 932a0f6f62cb2f33be1bade4059504d9c2749f9c (diff) |
libgd 2.2.3
git-svn-id: svn://tug.org/texlive/trunk@42778 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/gd/libgd-src/src/gd_bmp.c')
-rw-r--r-- | Build/source/libs/gd/libgd-src/src/gd_bmp.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/Build/source/libs/gd/libgd-src/src/gd_bmp.c b/Build/source/libs/gd/libgd-src/src/gd_bmp.c index 5f39b67c3e4..e1194c54d80 100644 --- a/Build/source/libs/gd/libgd-src/src/gd_bmp.c +++ b/Build/source/libs/gd/libgd-src/src/gd_bmp.c @@ -60,6 +60,9 @@ static int gdBMPPutInt(gdIOCtx *out, int w) return 0; } +/* + Function: gdImageBmpPtr +*/ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) { void *rv; @@ -71,6 +74,9 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) return rv; } +/* + Function: gdImageBmp +*/ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) { gdIOCtx *out = gdNewFileCtx(outFile); @@ -79,6 +85,9 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) out->gd_free(out); } +/* + Function: gdImageBmpCtx +*/ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) { int bitmap_size = 0, info_size, total_size, padding; @@ -343,8 +352,6 @@ static int compress_row(unsigned char *row, int length) if (compressed_run) { if (rle_type == BMP_RLE_TYPE_RLE) { compressed_length += build_rle_packet(row, rle_type, compressed_run, uncompressed_row); - } else { - compressed_length += build_rle_packet(row, rle_type, compressed_run, uncompressed_row); } } @@ -399,6 +406,9 @@ static int build_rle_packet(unsigned char *row, int packet_type, int length, uns return compressed_size; } +/* + Function: gdImageCreateFromBmp +*/ BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp(FILE * inFile) { gdImagePtr im = 0; @@ -409,6 +419,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp(FILE * inFile) return im; } +/* + Function: gdImageCreateFromBmpPtr +*/ BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr(int size, void *data) { gdImagePtr im; @@ -419,6 +432,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr(int size, void *data) return im; } +/* + Function: gdImageCreateFromBmpCtx +*/ BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpCtx(gdIOCtxPtr infile) { bmp_hdr_t *hdr; @@ -678,11 +694,13 @@ static int bmp_read_direct(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, b BMP_DEBUG(printf("RLE is only valid for 8-bit images\n")); return 1; } + break; case BMP_BI_RLE4: if (info->depth != 4) { BMP_DEBUG(printf("RLE is only valid for 4-bit images\n")); return 1; } + break; case BMP_BI_JPEG: case BMP_BI_PNG: default: |