Mercurial > hg > dmlib

comparison tools/libgfx.c @ 1620:469f363292b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename dmReadIFFChunk() to dmReadIFFChunkHdr().
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 16 May 2018 13:40:37 +0300
parents dacf4c2f7a86
children 9aaa8ee24626
comparison
equal deleted inserted replaced
1619:dacf4c2f7a86 1620:469f363292b8
1483 1483
1484 return DM_PROBE_SCORE_FALSE; 1484 return DM_PROBE_SCORE_FALSE;
1485 } 1485 }
1486 1486
1487 1487
1488 static BOOL dmReadIFFChunk(DMResource *fp, DMIFFChunk *chunk) 1488 static BOOL dmReadIFFChunkHdr(DMResource *fp, DMIFFChunk *chunk)
1489 { 1489 {
1490 if (!dmf_read_be32(fp, &chunk->id) || 1490 if (!dmf_read_be32(fp, &chunk->id) ||
1491 !dmf_read_be32(fp, &chunk->size)) 1491 !dmf_read_be32(fp, &chunk->size))
1492 { 1492 {
1493 dmError(DMERR_FREAD, 1493 dmError(DMERR_FREAD,
1741 int i, res = DMERR_OK; 1741 int i, res = DMERR_OK;
1742 1742
1743 dmMemset(&iff, 0, sizeof(iff)); 1743 dmMemset(&iff, 0, sizeof(iff));
1744 1744
1745 // Read IFF FORM header 1745 // Read IFF FORM header
1746 if (!dmReadIFFChunk(fp, &chunk) || 1746 if (!dmReadIFFChunkHdr(fp, &chunk) ||
1747 chunk.id != IFF_ID_FORM || 1747 chunk.id != IFF_ID_FORM ||
1748 chunk.size < 32) 1748 chunk.size < 32)
1749 { 1749 {
1750 return dmError(DMERR_NOT_SUPPORTED, 1750 return dmError(DMERR_NOT_SUPPORTED,
1751 "ILBM: Not a IFF file (%08X vs %08X / %d).\n", 1751 "ILBM: Not a IFF file (%08X vs %08X / %d).\n",
1762 1762
1763 iff.planar = (idILBM == IFF_ID_ILBM); 1763 iff.planar = (idILBM == IFF_ID_ILBM);
1764 1764
1765 while (!parsed && !dmfeof(fp)) 1765 while (!parsed && !dmfeof(fp))
1766 { 1766 {
1767 if (!dmReadIFFChunk(fp, &chunk)) 1767 if (!dmReadIFFChunkHdr(fp, &chunk))
1768 { 1768 {
1769 return dmError(DMERR_FREAD, 1769 return dmError(DMERR_FREAD,
1770 "ILBM: Error reading IFF ILBM data.\n"); 1770 "ILBM: Error reading IFF ILBM data.\n");
1771 } 1771 }
1772 1772