Akshay Kumar Dubey
3e1aa5805c
Refactor ZIP decompression classes (Inflater, InflaterBytes) to support multiple decompression algorithms, enabling future Zstandard support. Make Inflater and InflaterBytes abstract base classes defining a common interface. Move the original zlib/Deflate logic into new derived classes InflateZlib and InflaterBytesZlib. Update usage sites to instantiate the *Zlib variants via unique_ptr to the base class, preserving existing functionality. Move header files to standard locations (include/package, package/inc) and update includes and build files. This pure refactoring prepares the codebase for adding Zstandard (zstd) decompression. Correct a minor logical bug in the ZipFile::getSizeAndCRC loop condition. Change-Id: I9be3c02946e29eb2dae09f500eb47d8a4261af22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183504 Reviewed-by: Devansh Varshney <varshney.devansh614@gmail.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* 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/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <package/Inflater.hxx>
|
|
#include <zlib.h>
|
|
|
|
namespace ZipUtils
|
|
{
|
|
class DLLPUBLIC_PACKAGE InflateZlib : public Inflater
|
|
{
|
|
private:
|
|
bool bFinished;
|
|
bool bNeedDict;
|
|
sal_Int32 nOffset;
|
|
sal_Int32 nLength;
|
|
sal_Int32 nLastInflateError;
|
|
css::uno::Sequence<sal_Int8> sInBuffer;
|
|
std::unique_ptr<z_stream> pStream;
|
|
|
|
sal_Int32 doInflateBytes(css::uno::Sequence<sal_Int8>& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength);
|
|
|
|
public:
|
|
explicit InflateZlib(bool bNoWrap);
|
|
virtual ~InflateZlib() override;
|
|
|
|
virtual void setInput(const css::uno::Sequence<sal_Int8>& rBuffer) override;
|
|
virtual bool needsDictionary() const override { return bNeedDict; }
|
|
virtual bool finished() const override { return bFinished; }
|
|
virtual sal_Int32 doInflateSegment(css::uno::Sequence<sal_Int8>& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength) override;
|
|
virtual void end() override final;
|
|
virtual sal_Int32 getLastInflateError() const override { return nLastInflateError; }
|
|
};
|
|
|
|
} // namespace ZipUtils
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|