am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

[android/aapt.git] / Images.h

diff --git a/Images.h b/Images.h
index 168e22ff8b53a041f3d6706195a81fa1188f3c31..91b6554c02c9a7a5d8b329ff147bb7d00f546e39 100644 (file)
--- a/Images.h
+++ b/Images.h
@@ -8,11 +8,19 @@
 #define IMAGES_H
 
 #include "ResourceTable.h"
+#include "Bundle.h"
 
-status_t preProcessImage(Bundle* bundle, const sp<AaptAssets>& assets,
+#include <utils/String8.h>
+#include <utils/RefBase.h>
+
+using android::String8;
+
+status_t preProcessImage(const Bundle* bundle, const sp<AaptAssets>& assets,
                          const sp<AaptFile>& file, String8* outNewLeafName);
 
+status_t preProcessImageToCache(const Bundle* bundle, const String8& source, const String8& dest);
+
 status_t postProcessImage(const sp<AaptAssets>& assets,
-                                                 ResourceTable* table, const sp<AaptFile>& file);
+                          ResourceTable* table, const sp<AaptFile>& file);
 
 #endif