diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:34:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:34:28 +0000 |
| commit | 7cc49092f8d6d5c63be36d43e9bd311cd978dcee (patch) | |
| tree | 6b1e0ee472a7732b653ca8f20c2a0c2f59597fd2 /goodies | |
| parent | fe3e65e857e5e1304e3012ea56da2a642238bf1a (diff) | |
INTEGRATION: CWS ooo20040815 (1.3.202); FILE MERGED
2004/08/04 12:51:45 waratah 1.3.202.1: #i32569# implement long char constant in portable way,
reorder definitions to match class definition
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/itga/itga.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/goodies/source/filter.vcl/itga/itga.cxx b/goodies/source/filter.vcl/itga/itga.cxx index 4e45178487f6..65bb0c36eb5e 100644 --- a/goodies/source/filter.vcl/itga/itga.cxx +++ b/goodies/source/filter.vcl/itga/itga.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itga.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ka $ $Date: 2002-05-29 13:11:36 $ + * last change: $Author: hr $ $Date: 2004-09-09 11:34:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,15 +152,15 @@ public: //=================== Methoden von TGAReader ============================== TGAReader::TGAReader() : - mbStatus ( TRUE ), mpAcc ( NULL ), mpFileHeader ( NULL ), mpFileFooter ( NULL ), mpExtension ( NULL ), mpColorMap ( NULL ), + mbStatus ( TRUE ), + mnTGAVersion ( 1 ), mbIndexing ( FALSE ), - mbEncoding ( FALSE ), - mnTGAVersion ( 1 ) + mbEncoding ( FALSE ) { } @@ -256,8 +256,11 @@ BOOL TGAReader::ImplReadHeader() mpFileFooter->nSignature[0] >> mpFileFooter->nSignature[1] >> mpFileFooter->nSignature[2] >> mpFileFooter->nSignature[3] >> mpFileFooter->nPadByte >> mpFileFooter->nStringTerminator; - if ( mpFileFooter->nSignature[ 0 ] == 'TRUE' && mpFileFooter->nSignature[ 1 ] == 'VISI' && - mpFileFooter->nSignature[ 2 ] == 'ON-X' && mpFileFooter->nSignature[ 3 ] == 'FILE' ) + // check for TRUE, VISI, ON-X, FILE in the signatures + if ( mpFileFooter->nSignature[ 0 ] == 'T'<<24|'R'<<16|'U'<<8|'E' && + mpFileFooter->nSignature[ 1 ] == 'V'<<24|'I'<<16|'S'<<8|'I' && + mpFileFooter->nSignature[ 2 ] == 'O'<<24|'N'<<16|'-'<<8|'X' && + mpFileFooter->nSignature[ 3 ] == 'F'<<24|'I'<<16|'L'<<8|'E' ) { mpExtension = new TGAExtension; if ( mpExtension ) @@ -782,8 +785,9 @@ extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, } //================== ein bischen Muell fuer Windows ========================== - +#ifndef GCC #pragma hdrstop +#endif #ifdef WIN |