summaryrefslogtreecommitdiffstats
path: root/src/io/inkjar.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-14 16:47:47 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-14 16:47:47 +0000
commitfee7ec667cc353e1efda6a1a92f1f4715836fa4f (patch)
tree63fe115530cd3f8511b29cf2e250fcf23dc8fe08 /src/io/inkjar.cpp
parentupdate credits (diff)
parent"Relative to" option for node alignment. (diff)
downloadinkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.tar.gz
inkscape-fee7ec667cc353e1efda6a1a92f1f4715836fa4f.zip
update to trunk
(bzr r13682.1.32)
Diffstat (limited to 'src/io/inkjar.cpp')
-rw-r--r--src/io/inkjar.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/io/inkjar.cpp b/src/io/inkjar.cpp
index fb1fedf55..345455c4a 100644
--- a/src/io/inkjar.cpp
+++ b/src/io/inkjar.cpp
@@ -103,14 +103,19 @@ bool JarFile::init_inflation()
bool JarFile::open()
{
+ if (_file != NULL) {
+ fclose(_file);
+ }
if ((_file = fopen(_filename, "r")) == NULL) {
- fprintf(stderr, "open failed.\n");
- return false;
+ fprintf(stderr, "open failed.\n");
+ return false;
+ }
+ if (!init_inflation()) {
+ return false;
+ }
+ else {
+ return true;
}
- if (!init_inflation())
- return false;
-
- return true;
}
bool JarFile::close()