summaryrefslogtreecommitdiffstats
path: root/src/dom/util/ziptool.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-04-27 18:23:29 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-04-27 18:23:29 +0000
commitb96a42f69c88422e0df06c9d664cf242e7dfdec5 (patch)
tree3a3f984020bef55f3c8e1cc7b4cf9a242164fc33 /src/dom/util/ziptool.cpp
parentmerge from trunk (r12281) (diff)
parentmodify bbox width for Blur filter in Fill & Stroke (Bug 1171208) (diff)
downloadinkscape-b96a42f69c88422e0df06c9d664cf242e7dfdec5.tar.gz
inkscape-b96a42f69c88422e0df06c9d664cf242e7dfdec5.zip
merge from trunk (r12305)
(bzr r11668.1.68)
Diffstat (limited to 'src/dom/util/ziptool.cpp')
-rw-r--r--src/dom/util/ziptool.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp
index 9d9d5685c..cf024008f 100644
--- a/src/dom/util/ziptool.cpp
+++ b/src/dom/util/ziptool.cpp
@@ -1895,24 +1895,30 @@ bool GzipFile::readFile(const std::string &fileName)
/**
* Constructor
*/
-ZipEntry::ZipEntry()
+ZipEntry::ZipEntry() :
+ crc (0L),
+ fileName (),
+ comment (),
+ compressionMethod (8),
+ compressedData (),
+ uncompressedData (),
+ position (0)
{
- crc = 0L;
- compressionMethod = 8;
- position = 0;
}
/**
*
*/
ZipEntry::ZipEntry(const std::string &fileNameArg,
- const std::string &commentArg)
+ const std::string &commentArg) :
+ crc (0L),
+ fileName (fileNameArg),
+ comment (commentArg),
+ compressionMethod (8),
+ compressedData (),
+ uncompressedData (),
+ position (0)
{
- crc = 0L;
- compressionMethod = 8;
- fileName = fileNameArg;
- comment = commentArg;
- position = 0;
}
/**