~ubuntu-branches/ubuntu/raring/notecase/raring

« back to all changes in this revision

Viewing changes to src/lib/IOLayerZlib.cpp

Committer: Bazaar Package Importer
Author(s): Nathan Handler
Date: 2008-12-21 13:09:58 UTC
mfrom: (1.1.6 upstream)
Revision ID: james.westby@ubuntu.com-20081221130958-0ri77h0x7j1dclkq

Tags: 1.9.8-0ubuntu1

https://launchpad.net/bugs/307752

New upstream release (LP: #307752)

files removed:
Makefile~

files modified:
Makefile

NoteCase.dsp

NoteCase.vcproj

deb/control

debian/changelog

docs/control

docs/help.ncd

docs/install.iss

docs/notecase.spec

po/de.po

po/hr.po

po/it.po

po/notecase.pot

po/ro.po

readme.txt

src/AboutDlg.cpp

src/AboutDlg.h

src/DateTimeDlg.cpp

src/DateTimeDlg.h

src/DocAction.cpp

src/DocAction.h

src/DocActionAtt.cpp

src/DocActionAtt.h

src/DocActionFinish.cpp

src/DocActionFinish.h

src/DocActionFinishDel.cpp

src/DocActionFinishDel.h

src/DocActionFmt.cpp

src/DocActionFmt.h

src/DocActionPix.cpp

src/DocActionPix.h

src/DocActionSort.cpp

src/DocActionSort.h

src/EditDlg.cpp

src/EditDlg.h

src/ExecuteFile.h

src/FileAttachmentDlg.cpp

src/FileAttachmentDlg.h

src/FileExportDlg.cpp

src/FileExportDlg.h

src/FileSaveAsDlg.cpp

src/FileSaveAsDlg.h

src/FindDialog.cpp

src/FindDialog.h

src/FindReplaceDlg.cpp

src/FindReplaceDlg.h

src/FindReplaceInfo.cpp

src/FindReplaceInfo.h

src/LinkPropertiesDlg.cpp

src/LinkPropertiesDlg.h

src/MainWnd.cpp

src/MainWnd.h

src/NodePropertiesDlg.cpp

src/NodePropertiesDlg.h

src/OptionsDialog.cpp

src/OptionsDialog.h

src/PasswordDialog.cpp

src/PasswordDialog.h

src/PixPropertiesDlg.cpp

src/PixPropertiesDlg.h

src/PortableTrayIcon.cpp

src/PortableTrayIcon.h

src/ShortcutsList.cpp

src/ShortcutsList.h

src/ShortcutsListDlg.cpp

src/ShortcutsListDlg.h

src/TextView.cpp

src/TextView.h

src/TreeView.cpp

src/TreeView.h

src/callbacks.cpp

src/callbacks.h

src/config.h

src/gui/Dialog.cpp

src/gui/Dialog.h

src/gui/FileDialog.cpp

src/gui/FileDialog.h

src/gui/GuiLanguage.cpp

src/gui/GuiLanguage.h

src/gui/ProgressDlg.cpp

src/gui/ProgressDlg.h

src/interface.cpp

src/interface.h

src/lib/Base64.cpp

src/lib/Base64.h

src/lib/CircularBuffer.cpp

src/lib/CircularBuffer.h

src/lib/DocActionBase.h

src/lib/DocActionManager.cpp

src/lib/DocActionManager.h

src/lib/DocumentIterator.cpp

src/lib/DocumentIterator.h

src/lib/EnumDirectory.cpp

src/lib/EnumDirectory.h

src/lib/File64.cpp

src/lib/File64.h

src/lib/FilePath.cpp

src/lib/FilePath.h

src/lib/FmtInfo.cpp

src/lib/FmtInfo.h

src/lib/FormatIOBase.cpp

src/lib/FormatIOBase.h

src/lib/FormatIOEncHtml.cpp

src/lib/FormatIOEncHtml.h

src/lib/FormatIOExecutable.cpp

src/lib/FormatIOExecutable.h

src/lib/FormatIOGjots2.cpp

src/lib/FormatIOGjots2.h

src/lib/FormatIOHtml.cpp

src/lib/FormatIOHtml.h

src/lib/FormatIOMMLX.cpp

src/lib/FormatIOMMLX.h

src/lib/FormatIOStickyNotes.cpp

src/lib/FormatIOStickyNotes.h

src/lib/FormatIOTxt.cpp

src/lib/FormatIOTxt.h

src/lib/HtmlParser.cpp

src/lib/HtmlParser.h

src/lib/IOLayerBase.cpp

src/lib/IOLayerBase.h

src/lib/IOLayerEnc.cpp

src/lib/IOLayerEnc.h

src/lib/IOLayerFile64.cpp

src/lib/IOLayerFile64.h

src/lib/IOLayerRedirect.cpp

src/lib/IOLayerRedirect.h

src/lib/IOLayerZlib.cpp

src/lib/IOLayerZlib.h

src/lib/IOProcess.cpp

src/lib/IOProcess.h

src/lib/IniFile.cpp

src/lib/IniFile.h

src/lib/LinkInfo.cpp

src/lib/LinkInfo.h

src/lib/NoteDocument.cpp

src/lib/NoteDocument.h

src/lib/NoteNode.cpp

src/lib/NoteNode.h

src/lib/SHA1.cpp

src/lib/SHA1.h

src/lib/TextSearch.cpp

src/lib/TextSearch.h

src/lib/Thread.cpp

src/lib/Thread.h

src/lib/blowfish.cpp

src/lib/blowfish.h

src/lib/blowfish2.h

src/lib/debug.cpp

src/lib/debug.h

src/lib/types.h

src/main.cpp

src/mru.cpp

src/mru.h

src/support.cpp

src/support.h

Show diffs side-by-side

added added

removed removed

src/lib/IOLayerZlib.cpp

////////////////////////////////////////////////////////////////////////////

// NoteCase notes manager project <http://notecase.sf.net>

// This code is licensed under BSD license.See "license.txt" for more details.

// File: Implements layer to compress/decompress Zlib compressed data

////////////////////////////////////////////////////////////////////////////

#include "IOLayerZlib.h"

#include <stdlib.h>

#include <memory.h>

#include "debug.h"

IOLayerZlib::IOLayerZlib()

{

m_err = Z_OK;

m_nMode = MODE_UNK;

m_bInitialised = false;

m_nPackLevel = Z_DEFAULT_COMPRESSION;

memset(&m_stream, 0, sizeof(z_stream));

}

IOLayerZlib::~IOLayerZlib()

{

}

void IOLayerZlib::Initialize(int nMode)

{

IOLayerBase::Initialize(nMode);

//stream object initialization

if(!m_bInitialised)

{

if(MODE_WRITE == m_nMode)

m_err = deflateInit(&m_stream, m_nPackLevel); //compression

else

m_err = inflateInit(&m_stream); //decompression

ASSERT(m_err == Z_OK); // check state

m_stream.avail_in = 0;

m_stream.avail_out = m_nOutLength;

m_stream.next_out = m_szOutBuffer;

m_bInitialised = true;

}

int IOLayerZlib::Process(char *szBuffer, int nLen)

{

int nBytes = 0;

//if stream length is known in advance, process only up to X bytes

if(m_nTotalInBytes >= 0)

{

if((m_nProcessedInBytes + nLen) > m_nTotalInBytes){

TRACE(" IOLayerZlib::Process Reached end of stream!!\n");

nLen = m_nTotalInBytes - m_nProcessedInBytes;

}

if(nLen <= 0) return 0;

//do the operation

if(MODE_WRITE == m_nMode)

nBytes = Write(szBuffer, nLen);

else

nBytes = Read(szBuffer, nLen);

//store output size for this operation

m_nLastOutBytes = nBytes;

m_nProcessedInBytes += nLen;

m_nProcessedOutBytes += nBytes;

return 0;

}

int IOLayerZlib::Read(char *szBuffer, int nLen)

{

//decompress content

TRACE("IOLayerZlib::Read (size %d bytes)\n", nLen);

ASSERT(nLen > 0);

if(nLen < 1)

return 0;

ASSERT(m_stream.avail_in == 0);

m_stream.next_in = (unsigned char *)szBuffer;

m_stream.avail_in = nLen;

int nTotalBytes = 0;

bool bSucess = false;

bSucess = DoProcessing(Z_NO_FLUSH, nTotalBytes);

// TOFIX err handling

return nTotalBytes;

}

int IOLayerZlib::Write(char *szBuffer, int nLen)

{

//compress content

TRACE("IOLayerZlib::Write (%d bytes)\n", nLen);

100

ASSERT(nLen > 0);

101

if(nLen < 1)

102

return 0;

103

104

ASSERT(m_stream.avail_in == 0);

105

m_stream.next_in = (unsigned char *)szBuffer;

106

m_stream.avail_in = nLen;

107

108

int nTotalBytes = 0;

109

bool bSucess = false;

110

bSucess = DoProcessing(Z_NO_FLUSH, nTotalBytes);

111

// TOFIX err handling

112

return nTotalBytes;

113

}

114

115

int IOLayerZlib::Finalize()

116

{

117

int nTotalBytes = 0;

118

bool bSucess = false;

119

TRACE("IOLayerZlib::Finalize start\n");

120

bSucess = DoProcessing(Z_FINISH, nTotalBytes);

121

TRACE("IOLayerZlib::Finalize (%d bytes)\n", nTotalBytes);

122

123

// cleanup stream memory

124

if(MODE_WRITE == m_nMode)

125

deflateEnd(&m_stream);

126

else

127

inflateEnd(&m_stream);

128

129

//call next layer attached?

130

if(NULL != m_pNextLayer)

131

return m_pNextLayer->Finalize();

132

133

return nTotalBytes;

134

}

135

136

bool IOLayerZlib::DoProcessing(int nFlag, int &nTotal)

137

{

138

int nTotalBytes = 0;

139

int nTotalBytesExt = 0;

140

141

m_err = Z_OK;

142

143

for(;;)

144

{

145

m_stream.avail_out = m_nOutLength;

146

m_stream.next_out = m_szOutBuffer;

147

148

if(MODE_WRITE == m_nMode)

149

m_err = deflate(&m_stream, nFlag);

150

else

151

m_err = inflate(&m_stream, nFlag);

152

153

unsigned int nBytes = m_nOutLength - m_stream.avail_out;

154

TRACE(" IOLayerZlib::DoProcessing zlib output: %d bytes, zlib stream state: %s\n", nBytes, m_stream.msg);

155

156

nTotalBytes += nBytes;

157

m_nLastOutBytes = nBytes;

158

m_nProcessedOutBytes += nBytes;

159

160

//call next layer attached?

161

if(NULL != m_pNextLayer && nBytes > 0)

162

nTotalBytesExt += m_pNextLayer->Process((char *)m_szOutBuffer, nBytes);

163

164

//control looping here

165

if(m_err != Z_OK)

166

break;

167

if(nFlag == Z_NO_FLUSH && m_stream.avail_in == 0)

168

break;

169

}

170

171

//TRACE(" IOLayerZlib::DoProcessing end (zlib unprocessed: %d bytes)\n", m_stream.avail_in);

172

nTotal = nTotalBytes;

173

return true;

174

}

////////////////////////////////////////////////////////////////////////////

// NoteCase notes manager project <http://notecase.sf.net>

// This code is licensed under BSD license.See "license.txt" for more details.

// File: Implements layer to compress/decompress Zlib compressed data

////////////////////////////////////////////////////////////////////////////

#include "IOLayerZlib.h"

#include <stdlib.h>

#include <memory.h>

#include "debug.h"

IOLayerZlib::IOLayerZlib()

{

m_err = Z_OK;

m_nMode = MODE_UNK;

m_bInitialised = false;

m_nPackLevel = Z_DEFAULT_COMPRESSION;

memset(&m_stream, 0, sizeof(z_stream));

}

IOLayerZlib::~IOLayerZlib()

{

}

void IOLayerZlib::Initialize(int nMode)

{

IOLayerBase::Initialize(nMode);

//stream object initialization

if(!m_bInitialised)

{

if(MODE_WRITE == m_nMode)

m_err = deflateInit(&m_stream, m_nPackLevel); //compression

else

m_err = inflateInit(&m_stream); //decompression

ASSERT(m_err == Z_OK); // check state

m_stream.avail_in = 0;

m_stream.avail_out = m_nOutLength;

m_stream.next_out = m_szOutBuffer;

m_bInitialised = true;

}

int IOLayerZlib::Process(char *szBuffer, int nLen)

{

int nBytes = 0;

//if stream length is known in advance, process only up to X bytes

if(m_nTotalInBytes >= 0)

{

if((m_nProcessedInBytes + nLen) > m_nTotalInBytes){

TRACE(" IOLayerZlib::Process Reached end of stream!!\n");

nLen = m_nTotalInBytes - m_nProcessedInBytes;

}

if(nLen <= 0) return 0;

//do the operation

if(MODE_WRITE == m_nMode)

nBytes = Write(szBuffer, nLen);

else

nBytes = Read(szBuffer, nLen);

//store output size for this operation

m_nLastOutBytes = nBytes;

m_nProcessedInBytes += nLen;

m_nProcessedOutBytes += nBytes;

return 0;

}

int IOLayerZlib::Read(char *szBuffer, int nLen)

{

//decompress content

TRACE("IOLayerZlib::Read (size %d bytes)\n", nLen);

ASSERT(nLen > 0);

if(nLen < 1)

return 0;

ASSERT(m_stream.avail_in == 0);

m_stream.next_in = (unsigned char *)szBuffer;

m_stream.avail_in = nLen;

int nTotalBytes = 0;

bool bSucess = false;

bSucess = DoProcessing(Z_NO_FLUSH, nTotalBytes);

// TOFIX err handling

return nTotalBytes;

}

int IOLayerZlib::Write(char *szBuffer, int nLen)

{

//compress content

TRACE("IOLayerZlib::Write (%d bytes)\n", nLen);

100

ASSERT(nLen > 0);

101

if(nLen < 1)

102

return 0;

103

104

ASSERT(m_stream.avail_in == 0);

105

m_stream.next_in = (unsigned char *)szBuffer;

106

m_stream.avail_in = nLen;

107

108

int nTotalBytes = 0;

109

bool bSucess = false;

110

bSucess = DoProcessing(Z_NO_FLUSH, nTotalBytes);

111

// TOFIX err handling

112

return nTotalBytes;

113

}

114

115

int IOLayerZlib::Finalize()

116

{

117

int nTotalBytes = 0;

118

bool bSucess = false;

119

TRACE("IOLayerZlib::Finalize start\n");

120

bSucess = DoProcessing(Z_FINISH, nTotalBytes);

121

TRACE("IOLayerZlib::Finalize (%d bytes)\n", nTotalBytes);

122

123

// cleanup stream memory

124

if(MODE_WRITE == m_nMode)

125

deflateEnd(&m_stream);

126

else

127

inflateEnd(&m_stream);

128

129

//call next layer attached?

130

if(NULL != m_pNextLayer)

131

return m_pNextLayer->Finalize();

132

133

return nTotalBytes;

134

}

135

136

bool IOLayerZlib::DoProcessing(int nFlag, int &nTotal)

137

{

138

int nTotalBytes = 0;

139

int nTotalBytesExt = 0;

140

141

m_err = Z_OK;

142

143

for(;;)

144

{

145

m_stream.avail_out = m_nOutLength;

146

m_stream.next_out = m_szOutBuffer;

147

148

if(MODE_WRITE == m_nMode)

149

m_err = deflate(&m_stream, nFlag);

150

else

151

m_err = inflate(&m_stream, nFlag);

152

153

unsigned int nBytes = m_nOutLength - m_stream.avail_out;

154

TRACE(" IOLayerZlib::DoProcessing zlib output: %d bytes, zlib stream state: %s\n", nBytes, m_stream.msg);

155

156

nTotalBytes += nBytes;

157

m_nLastOutBytes = nBytes;

158

m_nProcessedOutBytes += nBytes;

159

160

//call next layer attached?

161

if(NULL != m_pNextLayer && nBytes > 0)

162

nTotalBytesExt += m_pNextLayer->Process((char *)m_szOutBuffer, nBytes);

163

164

//control looping here

165

if(m_err != Z_OK)

166

break;

167

if(nFlag == Z_NO_FLUSH && m_stream.avail_in == 0)

168

break;

169

}

170

171

//TRACE(" IOLayerZlib::DoProcessing end (zlib unprocessed: %d bytes)\n", m_stream.avail_in);

172

nTotal = nTotalBytes;

173

return true;

174

}

Older »