Merge pull request #1392 from stweil/duplicate
Remove duplicate assignments in function tiftoimage
This commit is contained in:
commit
fe2fa70716
|
@ -1284,8 +1284,6 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters,
|
||||||
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
|
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
|
||||||
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
|
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
|
||||||
TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
|
TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
|
||||||
w = (int)tiWidth;
|
|
||||||
h = (int)tiHeight;
|
|
||||||
|
|
||||||
if (tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */
|
if (tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */
|
||||||
fprintf(stderr, "tiftoimage: Bad value for samples per pixel == %d.\n"
|
fprintf(stderr, "tiftoimage: Bad value for samples per pixel == %d.\n"
|
||||||
|
|
Loading…
Reference in New Issue