summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-06-28 17:45:49 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-06-28 17:45:49 +0000
commitc65ece72d425d41855ef9fb63bf40473170a7efe (patch)
tree4919b18d725b25c7cf872c08827c645dc25b367e
parent1132b3145de6f37e38891d94dc0fe5ec49bf25a8 (diff)
downloadnavit-c65ece72d425d41855ef9fb63bf40473170a7efe.tar.gz
Fix:maptool:Fix wrong compression method usage
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3437 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--navit/maptool/zip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/navit/maptool/zip.c b/navit/maptool/zip.c
index 5317370f9..64f570900 100644
--- a/navit/maptool/zip.c
+++ b/navit/maptool/zip.c
@@ -145,8 +145,8 @@ write_zipmember(struct zip_info *zip_info, char *name, int filelen, char *data,
if (destlen < data_size) {
data=compbuffer;
comp_size=destlen;
+ } else
lfh.zipmthd=0;
- }
} else {
fprintf(stderr,"compress2 returned %d\n", error);
}
@@ -167,7 +167,7 @@ write_zipmember(struct zip_info *zip_info, char *name, int filelen, char *data,
cd.zipccrc=crc;
cd.zipcsiz=lfh.zipsize;
cd.zipcunc=data_size;
- cd.zipcmthd=zip_info->compression_level ? 8:0;
+ cd.zipcmthd=lfh.zipmthd;
if (zip_info->zip64) {
cd.zipofst=0xffffffff;
cd.zipcxtl+=sizeof(cd_ext);