marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#- Remove unused files StdBitmap.{cpp,h}

Nicolas Hake 2009-05-08 20:20:35 +02:00
parent 43f2e17bb5
commit e6d1eca02e
3 changed files with 0 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
standard/Standard.vc9.vcproj
View File

@ -1836,124 +1836,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="src\StdBitmap.cpp"
>
<FileConfiguration
Name="Editor Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Editor Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Editor Release (Debug)|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Engine Release Console|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Engine Debug Console|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Engine Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Engine Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Engine Release (Debug)|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="c4group Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="c4group Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="src\StdBuf.cpp"
>
@ -4373,10 +4255,6 @@
RelativePath="inc\StdBase64.h"
>
</File>
<File
RelativePath="inc\StdBitmap.h"
>
</File>
<File
RelativePath="inc\StdBuf.h"
>

66
standard/inc/StdBitmap.h
View File

@ -1,66 +0,0 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
*/
/* Bitmap handling routines */
#pragma pack( push, def_pack , 1)
#include "Bitmap256.h"
class CStdBitmapHead: public BITMAPFILEHEADER
{
public:
CStdBitmapHead(void);
public:
void Clear(void);
void Set(int iBitOffset);
BOOL Valid(void);
};
class CStdBitmapInfo: public BITMAPINFOHEADER
{
public:
CStdBitmapInfo(void);
public:
void Clear(void);
void Set(int iWdt, int iHgt, int iBitsPerPixel);
int Pitch(void);
};
class CStdBitmap
{
public:
CStdBitmap();
~CStdBitmap();
public:
CStdBitmapHead Head;
CStdBitmapInfo Info;
RGBQUAD Colors[256];
BYTE *Bits;
public:
BOOL Ensure(int iWdt, int iHgt, int iBitsPerPixel);
int getPitch();
int getHeight();
int getWidth();
void Clear(void);
BOOL Create(int iWdt, int iHgt, int iBitsPerPixel);
BOOL Save(const char *szFileName);
BOOL Load(const char *szFileName);
BOOL Enlarge(int iWdt, int iHgt);
};
#pragma pack( pop, def_pack )

178
standard/src/StdBitmap.cpp
View File

@ -1,178 +0,0 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
*/
/* Bitmap handling routines */
#include <stdio.h>
#include <Standard.h>
#include <StdFile.h>
#include <CStdFile.h>
#include <StdBitmap.h>
//================================= CStdBitmapHead =======================================
CStdBitmapHead::CStdBitmapHead()
{
Clear();
}
void CStdBitmapHead::Clear()
{
ZeroMem((BYTE*)this,sizeof(CStdBitmapHead));
Set(0);
}
void CStdBitmapHead::Set(int iBitOffset)
{
bfType=*((WORD*)"BM");
bfSize=sizeof(CStdBitmapHead);
bfReserved1=bfReserved2=0;
bfOffBits=iBitOffset;
}
BOOL CStdBitmapHead::Valid()
{
if (bfType != *((WORD*)"BM") ) return FALSE;
return TRUE;
}
//============================= CStdBitmapInfo =========================================
CStdBitmapInfo::CStdBitmapInfo()
{
Clear();
}
void CStdBitmapInfo::Clear()
{
ZeroMem((BYTE*)this,sizeof(CStdBitmapInfo));
}
void CStdBitmapInfo::Set(int iWdt, int iHgt, int iBitsPerPixel)
{
Clear();
biSize=sizeof(CStdBitmapInfo);
biPlanes=1;
biWidth=iWdt;
biHeight=iHgt;
biBitCount=iBitsPerPixel;
biCompression=BI_RGB;
biSizeImage=DWordAligned(iWdt*iBitsPerPixel/8)*iHgt;
}
int CStdBitmapInfo::Pitch()
{
if (!biHeight) return 0;
return biSizeImage/Abs(biHeight);
}
//=============================== CStdBitmap ===========================================
CStdBitmap::CStdBitmap()
{
Bits=NULL;
Clear();
}
CStdBitmap::~CStdBitmap()
{
Clear();
}
void CStdBitmap::Clear()
{
Head.Clear();
Info.Clear();
ZeroMem((BYTE*)Colors,sizeof(RGBQUAD)*256);
if (Bits) delete [] Bits; Bits=NULL;
}
BOOL CStdBitmap::Create(int iWdt, int iHgt, int iBitsPerPixel)
{
// Init head
int coloroffset=0; if (iBitsPerPixel==8) coloroffset=256*sizeof(RGBQUAD);
Head.Set(sizeof(Head)+sizeof(Info)+coloroffset);
// Init info
Info.Set(iWdt,iHgt,iBitsPerPixel);
// Allocate bits
if (!(Bits=new BYTE [Info.biSizeImage])) return FALSE;
ZeroMem(Bits,Info.biSizeImage);
return TRUE;
}
BOOL CStdBitmap::Save(const char *szFileName)
{
CStdFile hFile;
if (!Bits) return FALSE;
int savesize=sizeof(Head)+sizeof(Info);
if (Info.biBitCount==8) savesize+=256*sizeof(RGBQUAD);
if (!hFile.Create(szFileName,FALSE)
|| !hFile.Write(this,savesize)
|| !hFile.Write(Bits,Info.biSizeImage)
|| !hFile.Close())
return FALSE;
return TRUE;
}
BOOL CStdBitmap::Enlarge(int iWdt, int iHgt)
{
if (!Bits) return FALSE;
iWdt=Max(iWdt,(int) Info.biWidth);
iHgt=Max(iHgt,(int) Abs(Info.biHeight));
if (!((iWdt>Info.biWidth) || (iHgt>Abs(Info.biHeight)))) return TRUE;
int nPitch = DWordAligned(iWdt*Info.biBitCount/8);
int nSize = nPitch*iHgt;
BYTE *nBits;
if (!(nBits = new BYTE [nSize])) return FALSE;
ZeroMem(nBits,nSize);
iHgt*=Sign(Info.biHeight);
StdBlit((uint8_t *)Bits,Info.Pitch(),Info.biHeight,
0,0,Info.biWidth,Info.biHeight,
(uint8_t *)nBits,nPitch,iHgt,
0,0,Info.biWidth,Info.biHeight,
Info.biBitCount/8);
Info.biWidth=iWdt;
Info.biHeight=iHgt;
Info.biSizeImage=nSize;
delete [] Bits;
Bits=nBits;
return TRUE;
}
int CStdBitmap::getWidth()
{
return Info.biWidth;
}
int CStdBitmap::getHeight()
{
return Info.biHeight;
}
int CStdBitmap::getPitch()
{
return Info.Pitch();
}
BOOL CStdBitmap::Ensure(int iWdt, int iHgt, int iBitsPerPixel)
{
// Create new
if (!Bits)
return Create(iWdt,iHgt,iBitsPerPixel);
// Enlarge (ignore any change in depth)
return Enlarge(iWdt,iHgt);
}