X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/af4e7fd976a11e2749b1d4b6203d3f9298eae9f5..7a7c29caf280ea038fb29377a75586bc5b527857:/Images.cpp diff --git a/Images.cpp b/Images.cpp index f2414dd..2b9b056 100644 --- a/Images.cpp +++ b/Images.cpp @@ -8,7 +8,7 @@ #include "Images.h" -#include +#include #include #include @@ -359,7 +359,7 @@ static status_t do_9patch(const char* imageName, image_info* image) const char* errorMsg = NULL; int errorPixel = -1; - const char* errorEdge = ""; + const char* errorEdge = NULL; int colorIndex = 0; @@ -463,6 +463,14 @@ static status_t do_9patch(const char* imageName, image_info* image) if (yDivs[numYDivs - 1] == H) { numRows--; } + + // Make sure the amount of rows and columns will fit in the number of + // colors we can use in the 9-patch format. + if (numRows * numCols > 0x7F) { + errorMsg = "Too many rows and columns in 9-patch perimeter"; + goto getout; + } + numColors = numRows * numCols; image->info9Patch.numColors = numColors; image->info9Patch.colors = (uint32_t*)malloc(numColors * sizeof(uint32_t)); @@ -533,12 +541,14 @@ getout: fprintf(stderr, "ERROR: 9-patch image %s malformed.\n" " %s.\n", imageName, errorMsg); - if (errorPixel >= 0) { - fprintf(stderr, - " Found at pixel #%d along %s edge.\n", errorPixel, errorEdge); - } else { - fprintf(stderr, - " Found along %s edge.\n", errorEdge); + if (errorEdge != NULL) { + if (errorPixel >= 0) { + fprintf(stderr, + " Found at pixel #%d along %s edge.\n", errorPixel, errorEdge); + } else { + fprintf(stderr, + " Found along %s edge.\n", errorEdge); + } } return UNKNOWN_ERROR; } @@ -613,7 +623,7 @@ static void dump_image(int w, int h, png_bytepp rows, int color_type) } else if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { bpp = 2; } else if (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA) { - // We use a padding byte even when there is no alpha + // We use a padding byte even when there is no alpha bpp = 4; } else { printf("Unknown color type %d.\n", color_type); @@ -954,7 +964,7 @@ static void write_png(const char* imageName, compression_type)); } -status_t preProcessImage(Bundle* bundle, const sp& assets, +status_t preProcessImage(const Bundle* bundle, const sp& assets, const sp& file, String8* outNewLeafName) { String8 ext(file->getPath().getPathExtension()); @@ -970,6 +980,10 @@ status_t preProcessImage(Bundle* bundle, const sp& assets, String8 printableName(file->getPrintableSource()); + if (bundle->getVerbose()) { + printf("Processing image: %s\n", printableName.string()); + } + png_structp read_ptr = NULL; png_infop read_info = NULL; FILE* fp; @@ -1070,7 +1084,132 @@ bail: return error; } +status_t preProcessImageToCache(const Bundle* bundle, const String8& source, const String8& dest) +{ + png_structp read_ptr = NULL; + png_infop read_info = NULL; + + FILE* fp; + + image_info imageInfo; + + png_structp write_ptr = NULL; + png_infop write_info = NULL; + + status_t error = UNKNOWN_ERROR; + + if (bundle->getVerbose()) { + printf("Processing image to cache: %s => %s\n", source.string(), dest.string()); + } + + // Get a file handler to read from + fp = fopen(source.string(),"rb"); + if (fp == NULL) { + fprintf(stderr, "%s ERROR: Unable to open PNG file\n", source.string()); + return error; + } + + // Call libpng to get a struct to read image data into + read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!read_ptr) { + fclose(fp); + png_destroy_read_struct(&read_ptr, &read_info,NULL); + return error; + } + + // Call libpng to get a struct to read image info into + read_info = png_create_info_struct(read_ptr); + if (!read_info) { + fclose(fp); + png_destroy_read_struct(&read_ptr, &read_info,NULL); + return error; + } + // Set a jump point for libpng to long jump back to on error + if (setjmp(png_jmpbuf(read_ptr))) { + fclose(fp); + png_destroy_read_struct(&read_ptr, &read_info,NULL); + return error; + } + + // Set up libpng to read from our file. + png_init_io(read_ptr,fp); + + // Actually read data from the file + read_png(source.string(), read_ptr, read_info, &imageInfo); + + // We're done reading so we can clean up + // Find old file size before releasing handle + fseek(fp, 0, SEEK_END); + size_t oldSize = (size_t)ftell(fp); + fclose(fp); + png_destroy_read_struct(&read_ptr, &read_info,NULL); + + // Check to see if we're dealing with a 9-patch + // If we are, process appropriately + if (source.getBasePath().getPathExtension() == ".9") { + if (do_9patch(source.string(), &imageInfo) != NO_ERROR) { + return error; + } + } + + // Call libpng to create a structure to hold the processed image data + // that can be written to disk + write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!write_ptr) { + png_destroy_write_struct(&write_ptr, &write_info); + return error; + } + + // Call libpng to create a structure to hold processed image info that can + // be written to disk + write_info = png_create_info_struct(write_ptr); + if (!write_info) { + png_destroy_write_struct(&write_ptr, &write_info); + return error; + } + + // Open up our destination file for writing + fp = fopen(dest.string(), "wb"); + if (!fp) { + fprintf(stderr, "%s ERROR: Unable to open PNG file\n", dest.string()); + png_destroy_write_struct(&write_ptr, &write_info); + return error; + } + + // Set up libpng to write to our file + png_init_io(write_ptr, fp); + + // Set up a jump for libpng to long jump back on on errors + if (setjmp(png_jmpbuf(write_ptr))) { + fclose(fp); + png_destroy_write_struct(&write_ptr, &write_info); + return error; + } + + // Actually write out to the new png + write_png(dest.string(), write_ptr, write_info, imageInfo, + bundle->getGrayscaleTolerance()); + + if (bundle->getVerbose()) { + // Find the size of our new file + FILE* reader = fopen(dest.string(), "rb"); + fseek(reader, 0, SEEK_END); + size_t newSize = (size_t)ftell(reader); + fclose(reader); + + float factor = ((float)newSize)/oldSize; + int percent = (int)(factor*100); + printf(" (processed image to cache entry %s: %d%% size of source)\n", + dest.string(), percent); + } + + //Clean up + fclose(fp); + png_destroy_write_struct(&write_ptr, &write_info); + + return NO_ERROR; +} status_t postProcessImage(const sp& assets, ResourceTable* table, const sp& file)