solenv/clang-format/excludelist | 3 vcl/source/filter/itiff/ccidecom.hxx | 125 ----------------------------------- vcl/source/filter/itiff/lzwdecom.hxx | 69 ------------------- 3 files changed, 197 deletions(-)
New commits: commit e6c1e7245ab526411acbe337e3bd655f10e9bf45 Author: Caolán McNamara <[email protected]> AuthorDate: Sat May 21 20:37:23 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat May 21 22:54:18 2022 +0200 drop unused hxx files Change-Id: I68ea314f20b599c181f2ae9f264037918419d15c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134715 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 48e4c4855d01..4311ce590973 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -14833,10 +14833,7 @@ vcl/source/filter/ixbm/xbmread.cxx vcl/source/filter/ixpm/rgbtable.hxx vcl/source/filter/ixpm/xpmread.cxx vcl/source/filter/itga/itga.cxx -vcl/source/filter/itiff/ccidecom.cxx -vcl/source/filter/itiff/ccidecom.hxx vcl/source/filter/itiff/itiff.cxx -vcl/source/filter/itiff/lzwdecom.cxx vcl/source/filter/jpeg/Exif.cxx vcl/source/filter/jpeg/Exif.hxx vcl/source/filter/jpeg/JpegReader.cxx diff --git a/vcl/source/filter/itiff/ccidecom.hxx b/vcl/source/filter/itiff/ccidecom.hxx deleted file mode 100644 index cdf1d3d0843f..000000000000 --- a/vcl/source/filter/itiff/ccidecom.hxx +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <sal/types.h> -#include <array> -#include <memory> - -#define CCI_OPTION_2D 1 // 2D compression (instead of 1D) -#define CCI_OPTION_EOL 2 // There are EOL-Codes at the end of each line. -#define CCI_OPTION_BYTEALIGNEOL 4 // Filling bits before each EOL-Code, so that - // the end of EOL is bytes aligned -#define CCI_OPTION_BYTEALIGNROW 8 // Rows always start byte aligned -#define CCI_OPTION_INVERSEBITORDER 16 - -// Entry in the Huffman table: -struct CCIHuffmanTableEntry { - sal_uInt16 nValue; // The data value. - sal_uInt16 nCode; // The code through which the data value is represented. - sal_uInt16 nCodeBits; // Size of the code in bits. -}; - -// Entry in a hash table for daft decoding. -struct CCILookUpTableEntry { - sal_uInt16 nValue; - sal_uInt16 nCodeBits; -}; - -class SvStream; - -struct DecompressStatus -{ - bool m_bSuccess; - bool m_bBufferUnchanged; - DecompressStatus(bool bSuccess, bool bBufferUnchanged) - : m_bSuccess(bSuccess), m_bBufferUnchanged(bBufferUnchanged) - { - } -}; - -class CCIDecompressor { - -public: - - CCIDecompressor( sal_uInt32 nOptions, sal_uInt32 nImageWidth ); - ~CCIDecompressor(); - - void StartDecompression( SvStream & rIStream ); - - DecompressStatus DecompressScanline(sal_uInt8 * pTarget, sal_uInt64 nTargetBits, bool bLastLine); - -private: - - void MakeLookUp(const CCIHuffmanTableEntry * pHufTab, - const CCIHuffmanTableEntry * pHufTabSave, - CCILookUpTableEntry * pLookUp, - sal_uInt16 nHuffmanTableSize, - sal_uInt16 nMaxCodeBits); - - bool ReadEOL(); - - bool Read2DTag(); - - sal_uInt8 ReadBlackOrWhite(); - - sal_uInt16 ReadCodeAndDecode(const CCILookUpTableEntry * pLookUp, - sal_uInt16 nMaxCodeBits); - - static void FillBits(sal_uInt8 * pTarget, sal_uInt16 nTargetBits, - sal_uInt16 nBitPos, sal_uInt16 nNumBits, - sal_uInt8 nBlackOrWhite); - - static sal_uInt16 CountBits(const sal_uInt8 * pData, sal_uInt16 nDataSizeBits, - sal_uInt16 nBitPos, sal_uInt8 nBlackOrWhite); - - //returns true if pTarget was unmodified - bool Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits); - bool Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits); - - bool m_bTableBad; - - bool m_bStatus; - - std::unique_ptr<sal_uInt8[]> m_pByteSwap; - - SvStream * m_pIStream; - - sal_uInt32 m_nEOLCount; - - sal_uInt32 m_nWidth; - - sal_uInt32 m_nOptions; - - bool m_bFirstEOL; - - std::array<CCILookUpTableEntry, 1<<13> m_pWhiteLookUp; - std::array<CCILookUpTableEntry, 1<<13> m_pBlackLookUp; - std::array<CCILookUpTableEntry, 1<<10> m_p2DModeLookUp; - std::array<CCILookUpTableEntry, 1<<11> m_pUncompLookUp; - - sal_uInt32 m_nInputBitsBuf; - sal_uInt16 m_nInputBitsBufSize; - - std::unique_ptr<sal_uInt8[]> m_pLastLine; - sal_uInt64 m_nLastLineSize; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/itiff/lzwdecom.hxx b/vcl/source/filter/itiff/lzwdecom.hxx deleted file mode 100644 index c2a04bdeecb3..000000000000 --- a/vcl/source/filter/itiff/lzwdecom.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <sal/types.h> -#include <array> - -constexpr sal_Int16 MAX_TABLE_SIZE = 4096; - -struct LZWTableEntry -{ - sal_uInt16 nPrevCode; - sal_uInt16 nDataCount; - sal_uInt8 nData; -}; - -class SvStream; - -class LZWDecompressor -{ -public: - LZWDecompressor(); - - void StartDecompression(SvStream& rIStream); - - // Returns the number of written bytes. If < nMaxCount there is - // no more data to be unpacked or an error occurred. - sal_uInt64 Decompress(sal_uInt8* pTarget, sal_uInt32 nMaxCount); - -private: - sal_uInt16 GetNextCode(); - void AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData); - void DecompressSome(); - - SvStream* m_pIStream; - - std::array<LZWTableEntry, MAX_TABLE_SIZE> m_aTable; - sal_uInt16 m_nTableCurrentId; - - bool m_bEOIFound, m_bInvert; - - sal_uInt16 m_nOldCode; - - std::array<sal_uInt8, MAX_TABLE_SIZE> m_pOutBuf; - sal_uInt8* m_pOutBufData; - sal_uInt16 m_nOutBufDataLen; - - sal_uInt8 m_nInputBitsBuf; - sal_uInt16 m_nInputBitsBufSize; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
