resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0

diff --git a/Bundle.h b/Bundle.h
index 5089b9de28a83d53d67580fc2ff0bf4efb15f9fa..fde3bd68f834606299e816108d202c6246826f17 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -38,7 +38,6 @@ typedef enum Command {
     kCommandRemove,
     kCommandPackage,
     kCommandCrunch,
     kCommandRemove,
     kCommandPackage,
     kCommandCrunch,

-    kCommandSingleCrunch,

 } Command;
 
 /*
 } Command;
 
 /*


@@ -63,7 +62,6 @@ public:
           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL),
           mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL),
           mUseCrunchCache(false), mErrorOnFailedInsert(false), mOutputTextSymbols(NULL),
           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL),
           mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL),
           mUseCrunchCache(false), mErrorOnFailedInsert(false), mOutputTextSymbols(NULL),

-          mSingleCrunchInputFile(NULL), mSingleCrunchOutputFile(NULL),

           mArgc(0), mArgv(NULL)
         {}
     ~Bundle(void) {}
           mArgc(0), mArgv(NULL)
         {}
     ~Bundle(void) {}


@@ -178,10 +176,6 @@ public:
     bool getUseCrunchCache() const { return mUseCrunchCache; }
     const char* getOutputTextSymbols() const { return mOutputTextSymbols; }
     void setOutputTextSymbols(const char* val) { mOutputTextSymbols = val; }
     bool getUseCrunchCache() const { return mUseCrunchCache; }
     const char* getOutputTextSymbols() const { return mOutputTextSymbols; }
     void setOutputTextSymbols(const char* val) { mOutputTextSymbols = val; }

-    const char* getSingleCrunchInputFile() const { return mSingleCrunchInputFile; }
-    void setSingleCrunchInputFile(const char* val) { mSingleCrunchInputFile = val; }
-    const char* getSingleCrunchOutputFile() const { return mSingleCrunchOutputFile; }
-    void setSingleCrunchOutputFile(const char* val) { mSingleCrunchOutputFile = val; }

 
     /*
      * Set and get the file specification.
 
     /*
      * Set and get the file specification.


@@ -289,8 +283,6 @@ private:
     bool        mUseCrunchCache;
     bool        mErrorOnFailedInsert;
     const char* mOutputTextSymbols;
     bool        mUseCrunchCache;
     bool        mErrorOnFailedInsert;
     const char* mOutputTextSymbols;

-    const char* mSingleCrunchInputFile;
-    const char* mSingleCrunchOutputFile;

 
     /* file specification */
     int         mArgc;
 
     /* file specification */
     int         mArgc;

diff --git a/Command.cpp b/Command.cpp
index c3a093034d7d3b39e02f30488f195c73656d2a86..08d655469a3af5d4541eb9fdbe333b3425748c6c 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -7,7 +7,6 @@
 #include "Bundle.h"
 #include "ResourceFilter.h"
 #include "ResourceTable.h"
 #include "Bundle.h"
 #include "ResourceFilter.h"
 #include "ResourceTable.h"

-#include "Images.h"

 #include "XMLNode.h"
 
 #include <utils/Log.h>
 #include "XMLNode.h"
 
 #include <utils/Log.h>

diff --git a/Main.cpp b/Main.cpp
index 32fecb29034c4f742a6a2dee04f4cb142877ea83..f398de0630b981cdd655da2c1322508cf8b60aa1 100644 (file)
--- a/Main.cpp
+++ b/Main.cpp
@@ -85,11 +85,7 @@ void usage(void)
         "   Add specified files to Zip-compatible archive.\n\n", gProgName);
     fprintf(stderr,
         " %s c[runch] [-v] -S resource-sources ... -C output-folder ...\n"
         "   Add specified files to Zip-compatible archive.\n\n", gProgName);
     fprintf(stderr,
         " %s c[runch] [-v] -S resource-sources ... -C output-folder ...\n"

-        "   Do PNG preprocessing on one or several resource folders\n"
-        "   and store the results in the output folder.\n\n", gProgName);
-    fprintf(stderr,
-        " %s s[ingleCrunch] [-v] -i input-file -o outputfile\n"
-        "   Do PNG preprocessing on a single file.\n\n", gProgName);
+        "   Do PNG preprocessing and store the results in output folder.\n\n", gProgName);

     fprintf(stderr,
         " %s v[ersion]\n"
         "   Print program version.\n\n", gProgName);
     fprintf(stderr,
         " %s v[ersion]\n"
         "   Print program version.\n\n", gProgName);


@@ -207,14 +203,13 @@ int handleCommand(Bundle* bundle)
     //    printf("  %d: '%s'\n", i, bundle->getFileSpecEntry(i));
 
     switch (bundle->getCommand()) {
     //    printf("  %d: '%s'\n", i, bundle->getFileSpecEntry(i));
 
     switch (bundle->getCommand()) {

-    case kCommandVersion:      return doVersion(bundle);
-    case kCommandList:         return doList(bundle);
-    case kCommandDump:         return doDump(bundle);
-    case kCommandAdd:          return doAdd(bundle);
-    case kCommandRemove:       return doRemove(bundle);
-    case kCommandPackage:      return doPackage(bundle);
-    case kCommandCrunch:       return doCrunch(bundle);
-    case kCommandSingleCrunch: return doSingleCrunch(bundle);
+    case kCommandVersion:   return doVersion(bundle);
+    case kCommandList:      return doList(bundle);
+    case kCommandDump:      return doDump(bundle);
+    case kCommandAdd:       return doAdd(bundle);
+    case kCommandRemove:    return doRemove(bundle);
+    case kCommandPackage:   return doPackage(bundle);
+    case kCommandCrunch:    return doCrunch(bundle);

     default:
         fprintf(stderr, "%s: requested command not yet supported\n", gProgName);
         return 1;
     default:
         fprintf(stderr, "%s: requested command not yet supported\n", gProgName);
         return 1;


@@ -254,8 +249,6 @@ int main(int argc, char* const argv[])
         bundle.setCommand(kCommandPackage);
     else if (argv[1][0] == 'c')
         bundle.setCommand(kCommandCrunch);
         bundle.setCommand(kCommandPackage);
     else if (argv[1][0] == 'c')
         bundle.setCommand(kCommandCrunch);

-    else if (argv[1][0] == 's')
-        bundle.setCommand(kCommandSingleCrunch);

     else {
         fprintf(stderr, "ERROR: Unknown command '%s'\n", argv[1]);
         wantUsage = true;
     else {
         fprintf(stderr, "ERROR: Unknown command '%s'\n", argv[1]);
         wantUsage = true;


@@ -434,28 +427,6 @@ int main(int argc, char* const argv[])
                 convertPath(argv[0]);
                 bundle.setCrunchedOutputDir(argv[0]);
                 break;
                 convertPath(argv[0]);
                 bundle.setCrunchedOutputDir(argv[0]);
                 break;

-            case 'i':
-                argc--;
-                argv++;
-                if (!argc) {
-                    fprintf(stderr, "ERROR: No argument supplied for '-i' option\n");
-                    wantUsage = true;
-                    goto bail;
-                }
-                convertPath(argv[0]);
-                bundle.setSingleCrunchInputFile(argv[0]);
-                break;
-            case 'o':
-                argc--;
-                argv++;
-                if (!argc) {
-                    fprintf(stderr, "ERROR: No argument supplied for '-o' option\n");
-                    wantUsage = true;
-                    goto bail;
-                }
-                convertPath(argv[0]);
-                bundle.setSingleCrunchOutputFile(argv[0]);
-                break;

             case '0':
                 argc--;
                 argv++;
             case '0':
                 argc--;
                 argv++;

diff --git a/Main.h b/Main.h
index a6b39ac418dc11ecb78827cdd5e6c5a43a680e5f..d20c601a0c7726dcc561f17ef78156fccdb0c066 100644 (file)
--- a/Main.h
+++ b/Main.h
@@ -29,7 +29,6 @@ extern int doAdd(Bundle* bundle);
 extern int doRemove(Bundle* bundle);
 extern int doPackage(Bundle* bundle);
 extern int doCrunch(Bundle* bundle);
 extern int doRemove(Bundle* bundle);
 extern int doPackage(Bundle* bundle);
 extern int doCrunch(Bundle* bundle);

-extern int doSingleCrunch(Bundle* bundle);

 
 extern int calcPercent(long uncompressedLen, long compressedLen);
 
 
 extern int calcPercent(long uncompressedLen, long compressedLen);