6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-26 08:32:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove the "Tag" field in struct Bitmap since it is of no real use.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@5565 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2012-02-27 20:45:14 +00:00
parent d46c3fc5a9
commit 95eb20dc37
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sp65/bitmap.c
View File

@ -66,7 +66,6 @@ Bitmap* NewBitmap (unsigned Width, unsigned Height)
/* Initialize the data */ /* Initialize the data */
B->Type = bmUnknown; B->Type = bmUnknown;
B->Name = EmptyStrBuf; B->Name = EmptyStrBuf;
B->Tag = 0;
B->Width = Width; B->Width = Width;
B->Height = Height; B->Height = Height;
B->Pal = 0; B->Pal = 0;
@ -80,8 +79,7 @@ Bitmap* NewBitmap (unsigned Width, unsigned Height)
void FreeBitmap (Bitmap* B) void FreeBitmap (Bitmap* B)
/* Free a dynamically allocated bitmap */ /* Free a dynamically allocated bitmap */
{ {
/* Free the format specific data, the palette and then the bitmap */ /* Free the palette and then the bitmap */
xfree (B->Tag);
xfree (B->Pal); xfree (B->Pal);
xfree(B); xfree(B);
} }

5
src/sp65/bitmap.h
View File

@ -80,11 +80,6 @@ struct Bitmap {
*/ */
StrBuf Name; StrBuf Name;
/* Pointer to some format specific data. May be used by the frontend.
* The data is free'd as a block when calling FreeBitmap.
*/
void* Tag;
/* Size of the bitmap */ /* Size of the bitmap */
unsigned Width; unsigned Width;
unsigned Height; unsigned Height;

14
src/sp65/pcx.c
View File

@ -105,6 +105,14 @@ static PCXHeader* NewPCXHeader (void)
static void FreePCXHeader (PCXHeader* H)
/* Free a PCX header structure */
{
xfree (H);
}
static PCXHeader* ReadPCXHeader (FILE* F, const char* Name) static PCXHeader* ReadPCXHeader (FILE* F, const char* Name)
/* Read a structured PCX header from the given file and return it */ /* Read a structured PCX header from the given file and return it */
{ {
@ -275,9 +283,6 @@ Bitmap* ReadPCXFile (const char* Name)
/* Copy the name */ /* Copy the name */
SB_CopyStr (&B->Name, Name); SB_CopyStr (&B->Name, Name);
/* Remember the PCX header in the tag */
B->Tag = P;
/* Allocate memory for the scan line */ /* Allocate memory for the scan line */
L = xmalloc (P->Width); L = xmalloc (P->Width);
@ -429,6 +434,9 @@ Bitmap* ReadPCXFile (const char* Name)
/* Close the file */ /* Close the file */
fclose (F); fclose (F);
/* Free the PCX header */
FreePCXHeader (P);
/* Return the bitmap */ /* Return the bitmap */
return B; return B;
} }