Mercurial > hg > forks > libbpg

comparison bpgenc.c @ 7:6dc09314d44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve error handling.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 07 Dec 2016 12:27:40 +0200
parents 690bf78c1ce9
children 5a1eec3c43cc
comparison
equal deleted inserted replaced
6:690bf78c1ce9 7:6dc09314d44b
926 926
927 *pmd = NULL; 927 *pmd = NULL;
928 928
929 // Open and read TIFF header etc. 929 // Open and read TIFF header etc.
930 if ((tif = TIFFOpen(filename, "rb")) == NULL) 930 if ((tif = TIFFOpen(filename, "rb")) == NULL)
931 {
932 fprintf(stderr, "Could not open TIFF image '%s'\n", filename);
931 return NULL; 933 return NULL;
932 934 }
933 TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img_width); 935
934 TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img_height); 936 if (!TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img_width) ||
935 TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &img_spp); 937 !TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img_height) ||
936 TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &img_depth); 938 !TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &img_spp) ||
937 TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &img_sfmt); 939 !TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &img_depth))
940 {
941 fprintf(stderr, "TIFF file lacks basic fields!\n");
942 goto err;
943 }
944
938 TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &img_pconfig); 945 TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &img_pconfig);
939 946
940 // Check basics 947 // Check basics
941 if ((img_depth != 8 && img_depth != 16) || img_spp > 4) 948 if ((img_depth != 8 && img_depth != 16) || img_spp > 4)
942 goto err; 949 goto err;