diff options
Diffstat (limited to 'filter/source/graphicfilter/etiff/etiff.cxx')
| -rw-r--r-- | filter/source/graphicfilter/etiff/etiff.cxx | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 4bf1b2d1ae01..4214f0d7a8aa 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -43,9 +43,6 @@ #define ColorMap 320 -// - TIFFWriter - - - struct TIFFLZWCTreeNode { @@ -55,6 +52,7 @@ struct TIFFLZWCTreeNode sal_uInt16 nValue; // pixel value }; + class TIFFWriter { private: @@ -62,7 +60,7 @@ private: SvStream& m_rOStm; sal_uInt32 mnStreamOfs; - bool mbStatus; + bool mbStatus; BitmapReadAccess* mpAcc; sal_uInt32 mnWidth, mnHeight, mnColors; @@ -107,14 +105,13 @@ private: public: - explicit TIFFWriter(SvStream &rStream); - ~TIFFWriter(); + explicit TIFFWriter(SvStream &rStream); + ~TIFFWriter(); bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); }; - TIFFWriter::TIFFWriter(SvStream &rStream) : m_rOStm(rStream) , mnStreamOfs(0) @@ -147,10 +144,12 @@ TIFFWriter::TIFFWriter(SvStream &rStream) { } + TIFFWriter::~TIFFWriter() { } + bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { if ( pFilterConfigItem ) @@ -239,7 +238,6 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo } - void TIFFWriter::ImplCallback( sal_uInt32 nPercent ) { if ( xStatusIndicator.is() ) @@ -254,8 +252,6 @@ void TIFFWriter::ImplCallback( sal_uInt32 nPercent ) } - - bool TIFFWriter::ImplWriteHeader( bool bMultiPage ) { mnTagCount = 0; @@ -302,7 +298,7 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage ) mnBitmapPos = m_rOStm.Tell(); ImplWriteTag( StripOffsets, 4, 1, 0 ); ImplWriteTag( SamplesPerPixel, 3, 1, ( mnBitsPerPixel == 24 ) ? 3 : 1 ); - ImplWriteTag( RowsPerStrip, 4, 1, mnHeight ); //0xffffffff ); + ImplWriteTag( RowsPerStrip, 4, 1, mnHeight ); mnStripByteCountPos = m_rOStm.Tell(); ImplWriteTag( StripByteCounts, 4, 1, ( ( mnWidth * mnBitsPerPixel * mnHeight ) + 7 ) >> 3 ); mnXResPos = m_rOStm.Tell(); @@ -330,7 +326,6 @@ bool TIFFWriter::ImplWriteHeader( bool bMultiPage ) } - void TIFFWriter::ImplWritePalette() { sal_uInt16 i; @@ -357,7 +352,6 @@ void TIFFWriter::ImplWritePalette() } - void TIFFWriter::ImplWriteBody() { sal_uInt8 nTemp = 0; @@ -365,8 +359,8 @@ void TIFFWriter::ImplWriteBody() sal_uLong j, x, y; sal_uLong nGfxBegin = m_rOStm.Tell(); - m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset - m_rOStm.WriteUInt32( nGfxBegin - mnStreamOfs ); // to the bitmap data + m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset + m_rOStm.WriteUInt32( nGfxBegin - mnStreamOfs ); // to the bitmap data m_rOStm.Seek( nGfxBegin ); StartCompression(); @@ -464,7 +458,6 @@ void TIFFWriter::ImplWriteBody() } - void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit ) { sal_uLong nCurrentPos = m_rOStm.Tell(); @@ -476,7 +469,6 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti } - void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt32 nNumberOfItems, sal_uInt32 nValue) { mnTagCount++; @@ -490,7 +482,6 @@ void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt } - inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { dwShift |= ( nCode << ( nOffset - nCodeLen ) ); @@ -508,7 +499,6 @@ inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) } - void TIFFWriter::StartCompression() { sal_uInt16 i; @@ -535,7 +525,6 @@ void TIFFWriter::StartCompression() } - void TIFFWriter::Compress( sal_uInt8 nCompThis ) { TIFFLZWCTreeNode* p; @@ -589,7 +578,6 @@ void TIFFWriter::Compress( sal_uInt8 nCompThis ) } - void TIFFWriter::EndCompression() { if( pPrefix ) @@ -600,7 +588,6 @@ void TIFFWriter::EndCompression() } - extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { |