mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of _XPMPRIVATE

Browse Source 
Change-Id: I37396cfe303bdc17520a69ee7cbdbdbc219eea1c
This commit is contained in:
Stephan Bergmann 2016-04-08 21:07:14 +02:00
parent 9dee2bf5b4
commit e5963700ff
5 changed files with 77 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/inc/doxygen.cfg
View File

@ -2018,7 +2018,6 @@ PREDEFINED = LINUX \
OSL_DEBUG_LEVEL=2 \
CUI \
EXCEPTIONS_ON \
_XPMPRIVATE \
DOXYGEN_ONLY
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

1
solenv/inc/doxygen_doc.cfg
View File

@ -2018,7 +2018,6 @@ PREDEFINED = LINUX \
OSL_DEBUG_LEVEL=2 \
CUI \
EXCEPTIONS_ON \
_XPMPRIVATE \
DOXYGEN_ONLY
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

1
solenv/inc/doxygen_tag.cfg
View File

@ -2018,7 +2018,6 @@ PREDEFINED = LINUX \
OSL_DEBUG_LEVEL=2 \
CUI \
EXCEPTIONS_ON \
_XPMPRIVATE \
DOXYGEN_ONLY
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

78
vcl/source/filter/ixpm/xpmread.cxx
View File

@ -20,10 +20,86 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/graph.hxx>
#include "rgbtable.hxx"
#define _XPMPRIVATE
#include "xpmread.hxx"
#include <cstring>
#define XPMTEMPBUFSIZE 0x00008000
#define XPMSTRINGBUF 0x00008000
#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases
#define XPMDEFINITION 0x00000002 // the XPM format consists of
#define XPMVALUES 0x00000003
#define XPMCOLORS 0x00000004
#define XPMPIXELS 0x00000005
#define XPMEXTENSIONS 0x00000006
#define XPMENDEXT 0x00000007
#define XPMREMARK 0x00000001 // defines used by mnStatus
#define XPMDOUBLE 0x00000002
#define XPMSTRING 0x00000004
#define XPMFINISHED 0x00000008
#define XPMCASESENSITIVE 0x00000001
#define XPMCASENONSENSITIVE 0x00000002
enum ReadState
{
XPMREAD_OK,
XPMREAD_ERROR,
XPMREAD_NEED_MORE
};
class BitmapWriteAccess;
class Graphic;
class XPMReader : public GraphicReader
{
private:
SvStream& mrIStm;
Bitmap maBmp;
BitmapWriteAccess* mpAcc;
Bitmap maMaskBmp;
BitmapWriteAccess* mpMaskAcc;
long mnLastPos;
sal_uLong mnWidth;
sal_uLong mnHeight;
sal_uLong mnColors;
sal_uLong mnCpp; // characters per pix
bool mbTransparent;
bool mbStatus;
sal_uLong mnStatus;
sal_uLong mnIdentifier;
sal_uInt8 mcThisByte;
sal_uInt8 mcLastByte;
sal_uLong mnTempAvail;
sal_uInt8* mpTempBuf;
sal_uInt8* mpTempPtr;
sal_uInt8* mpFastColorTable;
sal_uInt8* mpColMap;
sal_uLong mnStringSize;
sal_uInt8* mpStringBuf;
sal_uLong mnParaSize;
sal_uInt8* mpPara;
bool ImplGetString();
bool ImplGetColor( sal_uLong );
bool ImplGetScanLine( sal_uLong );
bool ImplGetColSub( sal_uInt8* );
bool ImplGetColKey( sal_uInt8 );
void ImplGetRGBHex( sal_uInt8*, sal_uLong );
bool ImplGetPara( sal_uLong numb );
static bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
sal_uLong ImplGetULONG( sal_uLong nPara );
public:
explicit XPMReader( SvStream& rStm );
virtual ~XPMReader();
ReadState ReadXPM( Graphic& rGraphic );
};
XPMReader::XPMReader(SvStream& rStm)
: mrIStm(rStm)
, mpAcc(nullptr)

81
vcl/source/filter/ixpm/xpmread.hxx
View File

@ -22,87 +22,6 @@
#include <vcl/bitmap.hxx>
#ifdef _XPMPRIVATE
#define XPMTEMPBUFSIZE 0x00008000
#define XPMSTRINGBUF 0x00008000
#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases
#define XPMDEFINITION 0x00000002 // the XPM format consists of
#define XPMVALUES 0x00000003
#define XPMCOLORS 0x00000004
#define XPMPIXELS 0x00000005
#define XPMEXTENSIONS 0x00000006
#define XPMENDEXT 0x00000007
#define XPMREMARK 0x00000001 // defines used by mnStatus
#define XPMDOUBLE 0x00000002
#define XPMSTRING 0x00000004
#define XPMFINISHED 0x00000008
#define XPMCASESENSITIVE 0x00000001
#define XPMCASENONSENSITIVE 0x00000002
enum ReadState
{
XPMREAD_OK,
XPMREAD_ERROR,
XPMREAD_NEED_MORE
};
class BitmapWriteAccess;
class Graphic;
class XPMReader : public GraphicReader
{
private:
SvStream& mrIStm;
Bitmap maBmp;
BitmapWriteAccess* mpAcc;
Bitmap maMaskBmp;
BitmapWriteAccess* mpMaskAcc;
long mnLastPos;
sal_uLong mnWidth;
sal_uLong mnHeight;
sal_uLong mnColors;
sal_uLong mnCpp; // characters per pix
bool mbTransparent;
bool mbStatus;
sal_uLong mnStatus;
sal_uLong mnIdentifier;
sal_uInt8 mcThisByte;
sal_uInt8 mcLastByte;
sal_uLong mnTempAvail;
sal_uInt8* mpTempBuf;
sal_uInt8* mpTempPtr;
sal_uInt8* mpFastColorTable;
sal_uInt8* mpColMap;
sal_uLong mnStringSize;
sal_uInt8* mpStringBuf;
sal_uLong mnParaSize;
sal_uInt8* mpPara;
bool ImplGetString();
bool ImplGetColor( sal_uLong );
bool ImplGetScanLine( sal_uLong );
bool ImplGetColSub( sal_uInt8* );
bool ImplGetColKey( sal_uInt8 );
void ImplGetRGBHex( sal_uInt8*, sal_uLong );
bool ImplGetPara( sal_uLong numb );
static bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
sal_uLong ImplGetULONG( sal_uLong nPara );
public:
explicit XPMReader( SvStream& rStm );
virtual ~XPMReader();
ReadState ReadXPM( Graphic& rGraphic );
};
#endif // _XPMPRIVATE
VCL_DLLPUBLIC bool ImportXPM( SvStream& rStream, Graphic& rGraphic );
#endif // INCLUDED_VCL_SOURCE_FILTER_IXPM_XPMREAD_HXX