From 1f92fe181819088eace4e96a89971ba0df34100b Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 16 Jun 2016 21:49:39 +0300 Subject: [PATCH] Do not uncompress png - fix --- .../CoreResourcesFromAndroidAssetsCustom.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssetsCustom.java b/OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssetsCustom.java index c1999f610a..e32bcf35be 100644 --- a/OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssetsCustom.java +++ b/OsmAnd/src/net/osmand/core/android/CoreResourcesFromAndroidAssetsCustom.java @@ -201,10 +201,15 @@ public class CoreResourcesFromAndroidAssetsCustom extends interface_ICoreResourc + name + "'"); System.out.println(resourceData.path.getAbsolutePath()); final SWIGTYPE_p_QByteArray data; + final String dataPath = resourceData.path.getAbsolutePath(); if (resourceData.offset == 0 && resourceData.size == resourceData.path.length()) { - data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(resourceData.path.getAbsolutePath())); + if (dataPath.endsWith(".qz")) { + data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(dataPath)); + } else { + data = SwigUtilities.readEntireFile(dataPath); + } } else { - data = SwigUtilities.qDecompress(SwigUtilities.readPartOfFile(resourceData.path.getAbsolutePath(), + data = SwigUtilities.qDecompress(SwigUtilities.readPartOfFile(dataPath, resourceData.offset, resourceData.size)); } if (data == null) { @@ -238,15 +243,19 @@ public class CoreResourcesFromAndroidAssetsCustom extends interface_ICoreResourc return SwigUtilities.emptyQByteArray(); } System.out.println(resourceEntry.defaultVariant.path.getAbsolutePath()); - final SWIGTYPE_p_QByteArray bt; + final SWIGTYPE_p_QByteArray data; + final String dataPath = resourceEntry.defaultVariant.path.getAbsolutePath(); if (resourceEntry.defaultVariant.offset == 0 && resourceEntry.defaultVariant.size == resourceEntry.defaultVariant.path.length()) { - bt = SwigUtilities.readEntireFile(resourceEntry.defaultVariant.path.getAbsolutePath()); + if (dataPath.endsWith(".qz")) { + data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(dataPath)); + } else { + data = SwigUtilities.readEntireFile(dataPath); + } } else { - bt = SwigUtilities.readPartOfFile(resourceEntry.defaultVariant.path.getAbsolutePath(), - resourceEntry.defaultVariant.offset, resourceEntry.defaultVariant.size); + data = SwigUtilities.qDecompress(SwigUtilities.readPartOfFile(dataPath, + resourceEntry.defaultVariant.offset, resourceEntry.defaultVariant.size)); } - final SWIGTYPE_p_QByteArray data = SwigUtilities.qDecompress(bt); if (data == null) { Log.e(TAG, "Failed to load data of '" + name + "'"); if (ok != null)