head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.168 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.166 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.164 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.162 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.160 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.158 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.156 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.154 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.152 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.150 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.148 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.146 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.144 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.142 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.140 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.138 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.136 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.134 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.132 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.130 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.128 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.126 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.124 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.120 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.100 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.122 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.118 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.116 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.114 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.112 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.110 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.108 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.106 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.104 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.102 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.98 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.96 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.94 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.92 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.90 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.88 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.86 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.84 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.82 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.80 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.78 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.76 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.74 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.72 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.70 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.68 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.66 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.64 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.62 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.60 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.58 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.56 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.54 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.52 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.50 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.48 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.46 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.44 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.42 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.40 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.4 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.2 pkgsrc-2003Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2005.10.03.11.31.57; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.03.29.05.12.00; author ben; state dead; branches; next 1.1; 1.1 date 2003.02.17.09.20.26; author grant; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.02.17.09.20.26; author grant; state Exp; branches; next ; desc @@ 1.3 log @Depend on errno.h to provide errno. @ text @$NetBSD$ --- XMill/File.cpp.orig 2005-07-22 15:15:14.000000000 +0000 +++ XMill/File.cpp @@@@ -32,9 +32,6 @@@@ History: #include "stdafx.h" -/* external imports */ -extern int errno; - /* class CFile implementation */ CFile::CFile() { @ 1.2 log @Update xmill to v0.9.1 and remove unnecessary patches. Notable changes: * portability fixes for makefiles and for newer C++ compilers * configuration options to build xmill without included zlib/bzlib * will work with libbz2 as well as libbz @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2003/02/17 09:20:26 grant Exp $ d3 12 a14 150 --- src/ZLib.cpp.orig Sat Feb 15 02:54:15 2003 +++ src/ZLib.cpp @@@@ -125,7 +125,7 @@@@ Compressor::~Compressor() // We finish compression, if there has been some data in the queue { #ifdef USE_BZIP - bzCompressEnd(&state); + BZ2_bzCompressEnd(&state); #else deflateEnd(&state); #endif @@@@ -175,7 +175,7 @@@@ void Compressor::CompressMemStream(MemSt if(isinitialized==0) { #ifdef USE_BZIP - if(bzCompressInit(&state,7,0,0)!=BZ_OK) + if(BZ2_bzCompressInit(&state,7,0,0)!=BZ_OK) #else if(deflateInit(&state,zlib_compressidx)!=Z_OK) #endif @@@@ -183,8 +183,15 @@@@ void Compressor::CompressMemStream(MemSt Error("Error while compressing container!"); Exit(); } +#ifdef USE_BZIP + state.total_out_lo32=0; + state.total_out_hi32=0; + state.total_in_lo32=0; + state.total_in_hi32=0; +#else state.total_out=0; state.total_in=0; +#endif isinitialized=1; } @@@@ -205,7 +212,7 @@@@ void Compressor::CompressMemStream(MemSt saveavail=state.avail_out; #ifdef USE_BZIP - if(bzCompress(&state,BZ_RUN)!=BZ_RUN_OK) + if(BZ2_bzCompress(&state,BZ_RUN)!=BZ_RUN_OK) #else if(deflate(&state,Z_NO_FLUSH)!=Z_OK) #endif @@@@ -259,7 +266,7 @@@@ void Compressor::CompressData(unsigned c if(isinitialized==0) { #ifdef USE_BZIP - if(bzCompressInit(&state,7,0,0)!=BZ_OK) + if(BZ2_bzCompressInit(&state,7,0,0)!=BZ_OK) #else if(deflateInit(&state,zlib_compressidx)!=Z_OK) #endif @@@@ -267,8 +274,15 @@@@ void Compressor::CompressData(unsigned c Error("Error while compressing container!"); Exit(); } +#ifdef USE_BZIP + state.total_out_lo32=0; + state.total_out_hi32=0; + state.total_in_lo32=0; + state.total_in_hi32=0; +#else state.total_out=0; state.total_in=0; +#endif isinitialized=1; } @@@@ -278,7 +292,7 @@@@ void Compressor::CompressData(unsigned c // The actual compression #ifdef USE_BZIP - if(bzCompress(&state,BZ_RUN)!=BZ_RUN_OK) + if(BZ2_bzCompress(&state,BZ_RUN)!=BZ_RUN_OK) #else if(deflate(&state,Z_NO_FLUSH)!=Z_OK) #endif @@@@ -326,7 +340,7 @@@@ void Compressor::FinishCompress(unsigned saveavail=state.avail_out; #ifdef USE_BZIP - err=bzCompress(&state,BZ_FINISH); + err=BZ2_bzCompress(&state,BZ_FINISH); #else err=deflate(&state,Z_FINISH); #endif @@@@ -353,15 +367,25 @@@@ void Compressor::FinishCompress(unsigned while(1); // Let's store the input and output size +#ifdef USE_BZIP + if(uncompressedsize!=NULL) *uncompressedsize =state.total_in_lo32; + if(compressedsize!=NULL) *compressedsize =state.total_out_lo32; + + state.total_out_lo32=0; + state.total_out_hi32=0; + state.total_in_lo32=0; + state.total_in_hi32=0; +#else if(uncompressedsize!=NULL) *uncompressedsize =state.total_in; if(compressedsize!=NULL) *compressedsize =state.total_out; state.total_out=0; state.total_in=0; +#endif // Finally, we release the internal memory #ifdef USE_BZIP - if(bzCompressEnd(&state)!=BZ_OK) + if(BZ2_bzCompressEnd(&state)!=BZ_OK) #else if(deflateReset(&state)!=Z_OK) #endif @@@@ -404,7 +428,7 @@@@ char Uncompressor::Uncompress(Input *inp #endif #ifdef USE_BZIP - if(bzDecompressInit(&state,0,0)!=BZ_OK) + if(BZ2_bzDecompressInit(&state,0,0)!=BZ_OK) #else if(inflateInit(&state)!=Z_OK) #endif @@@@ -439,7 +463,7 @@@@ char Uncompressor::Uncompress(Input *inp // The actual decompression #ifdef USE_BZIP - switch(bzDecompress(&state)) + switch(BZ2_bzDecompress(&state)) #else switch(inflate(&state,Z_NO_FLUSH)) #endif @@@@ -454,11 +478,15 @@@@ char Uncompressor::Uncompress(Input *inp input->SkipData(save_in-state.avail_in); // Let's store the overall amount of "decompressed" data. +#ifdef USE_BZIP + *len=state.total_out_lo32; +#else *len=state.total_out; +#endif // Let's finish the decompression entirely #ifdef USE_BZIP - if(bzDecompressEnd(&state)!=BZ_OK) + if(BZ2_bzDecompressEnd(&state)!=BZ_OK) #else if(inflateReset(&state)!=Z_OK) #endif @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of xmill-0.7 into The NetBSD packages collection. XMill is a special-purpose compressor for XML data that typically achieves twice the compression rate over existing compressors, such as gzip. Provided by collver1@@attbi.com in PR pkg/20353, with minor changes by me. @ text @@