comparison tools/lib64util.c @ 2238:5db6e0b63b35

Change again how the interlace type information is stored. Now store it in DMC64Image::extraInfo[] where it actually makes sense. Also add index for FLI type.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 15 Jun 2019 06:43:36 +0300
parents fa5e74384d87
children e2c6af0c9431
comparison
equal deleted inserted replaced
2237:26f1bae40fb6 2238:5db6e0b63b35
55 indent, img->nblocks); 55 indent, img->nblocks);
56 56
57 if (img->fmt->type & D64_FMT_ILACE) 57 if (img->fmt->type & D64_FMT_ILACE)
58 { 58 {
59 char *tmps; 59 char *tmps;
60 switch (img->laceType) 60 switch (img->extraInfo[D64_EI_ILACE_TYPE])
61 { 61 {
62 case D64_ILACE_COLOR: tmps = "color"; break; 62 case D64_ILACE_COLOR: tmps = "color"; break;
63 case D64_ILACE_RES: tmps = "resolution"; break; 63 case D64_ILACE_RES: tmps = "resolution"; break;
64 default: tmps = "ERROR"; break; 64 default: tmps = "ERROR"; break;
65 } 65 }
66 fprintf(fh, 66 fprintf(fh,
67 "%sInterlace type : %s\n", 67 "%sInterlace type : %s\n",
68 indent, tmps); 68 indent, tmps);
69 } 69 }
70 70
71 if (img->fmt->type & D64_FMT_FLI)
72 {
73 fprintf(fh,
74 "%sFLI type : %d\n",
75 indent, img->extraInfo[D64_EI_FLI_TYPE]);
76 }
77
71 fprintf(fh, 78 fprintf(fh,
72 "%sWidth x Height : %d x %d\n" 79 "%sWidth x Height : %d x %d\n"
73 "%sCHwidth x CHheight : %d x %d\n" 80 "%sCHwidth x CHheight : %d x %d\n"
74 "%sd020 / border : %d ($%02x)\n" 81 "%sd020 / border : %d ($%02x)\n"
75 "%sd021 / background : %d ($%02x)\n", 82 "%sd021 / background : %d ($%02x)\n",