X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/a189615a5671748c348da8ab79042e9e2746eb5e..edacf88c80e6d421cc3542268a263b9fa9e13a7f:/Images.cpp?ds=sidebyside diff --git a/Images.cpp b/Images.cpp index a516a5a..3c471ca 100644 --- a/Images.cpp +++ b/Images.cpp @@ -44,6 +44,9 @@ struct image_info } free(allocRows); } + free(info9Patch.xDivs); + free(info9Patch.yDivs); + free(info9Patch.colors); } png_uint_32 width; @@ -332,8 +335,8 @@ static status_t do_9patch(const char* imageName, image_info* image) int H = image->height; int i, j; - int maxSizeXDivs = (W / 2 + 1) * sizeof(int32_t); - int maxSizeYDivs = (H / 2 + 1) * sizeof(int32_t); + int maxSizeXDivs = W * sizeof(int32_t); + int maxSizeYDivs = H * sizeof(int32_t); int32_t* xDivs = (int32_t*) malloc(maxSizeXDivs); int32_t* yDivs = (int32_t*) malloc(maxSizeYDivs); uint8_t numXDivs = 0; @@ -356,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; @@ -460,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)); @@ -530,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; } @@ -600,10 +613,22 @@ static bool patch_equals(Res_png_9patch& patch1, Res_png_9patch& patch2) { return true; } -static void dump_image(int w, int h, png_bytepp rows, int bpp) +static void dump_image(int w, int h, png_bytepp rows, int color_type) { int i, j, rr, gg, bb, aa; + int bpp; + if (color_type == PNG_COLOR_TYPE_PALETTE || color_type == PNG_COLOR_TYPE_GRAY) { + bpp = 1; + } 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 + bpp = 4; + } else { + printf("Unknown color type %d.\n", color_type); + } + for (j = 0; j < h; j++) { png_bytep row = rows[j]; for (i = 0; i < w; i++) { @@ -640,7 +665,7 @@ static void dump_image(int w, int h, png_bytepp rows, int bpp) #define MAX(a,b) ((a)>(b)?(a):(b)) #define ABS(a) ((a)<0?-(a):(a)) -static void analyze_image(image_info &imageInfo, int grayscaleTolerance, +static void analyze_image(const char *imageName, image_info &imageInfo, int grayscaleTolerance, png_colorp rgbPalette, png_bytep alphaPalette, int *paletteEntries, bool *hasTransparency, int *colorType, png_bytepp outRows) @@ -662,7 +687,7 @@ static void analyze_image(image_info &imageInfo, int grayscaleTolerance, // 3. There are no more than 256 distinct RGBA colors // NOISY(printf("Initial image data:\n")); - // dump_image(w, h, imageInfo.rows, 4); + // dump_image(w, h, imageInfo.rows, PNG_COLOR_TYPE_RGB_ALPHA); for (j = 0; j < h; j++) { png_bytep row = imageInfo.rows[j]; @@ -763,7 +788,7 @@ static void analyze_image(image_info &imageInfo, int grayscaleTolerance, *colorType = PNG_COLOR_TYPE_PALETTE; } else { if (maxGrayDeviation <= grayscaleTolerance) { - NOISY(printf("Forcing image to gray (max deviation = %d)\n", maxGrayDeviation)); + printf("%s: forcing image to gray (max deviation = %d)\n", imageName, maxGrayDeviation); *colorType = isOpaque ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_GRAY_ALPHA; } else { *colorType = isOpaque ? PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA; @@ -821,6 +846,7 @@ static void write_png(const char* imageName, int i; png_unknown_chunk unknowns[1]; + unknowns[0].data = NULL; png_bytepp outRows = (png_bytepp) malloc((int) imageInfo.height * png_sizeof(png_bytep)); if (outRows == (png_bytepp) 0) { @@ -845,8 +871,16 @@ static void write_png(const char* imageName, bool hasTransparency; int paletteEntries; - analyze_image(imageInfo, grayscaleTolerance, rgbPalette, alphaPalette, + analyze_image(imageName, imageInfo, grayscaleTolerance, rgbPalette, alphaPalette, &paletteEntries, &hasTransparency, &color_type, outRows); + + // If the image is a 9-patch, we need to preserve it as a ARGB file to make + // sure the pixels will not be pre-dithered/clamped until we decide they are + if (imageInfo.is9Patch && (color_type == PNG_COLOR_TYPE_RGB || + color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_PALETTE)) { + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } + switch (color_type) { case PNG_COLOR_TYPE_PALETTE: NOISY(printf("Image %s has %d colors%s, using PNG_COLOR_TYPE_PALETTE\n", @@ -910,21 +944,8 @@ static void write_png(const char* imageName, } png_write_image(write_ptr, rows); -// int bpp; -// if (color_type == PNG_COLOR_TYPE_PALETTE || color_type == PNG_COLOR_TYPE_GRAY) { -// bpp = 1; -// } else if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -// bpp = 2; -// } else if (color_type == PNG_COLOR_TYPE_RGB) { -// bpp = 4; -// } else if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) { -// bpp = 4; -// } else { -// printf("Uknknown color type %d, exiting.\n", color_type); -// exit(1); -// } // NOISY(printf("Final image data:\n")); -// dump_image(imageInfo.width, imageInfo.height, rows, bpp); +// dump_image(imageInfo.width, imageInfo.height, rows, color_type); png_write_end(write_ptr, write_info); @@ -932,6 +953,7 @@ static void write_png(const char* imageName, free(outRows[i]); } free(outRows); + free(unknowns[0].data); png_get_IHDR(write_ptr, write_info, &width, &height, &bit_depth, &color_type, &interlace_type,