Merge "Fixes for libpng 1.6" (45ca69e0) · Commits · e / os / android_frameworks_base

tools/aapt/Images.cpp

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1075,18 +1075,19 @@ static void write_png(const char* imageName,
	unknowns[b_index].size = chunk_size;		unknowns[b_index].size = chunk_size;
	}		}

			for (int i = 0; i < chunk_count; i++) {
			unknowns[i].location = PNG_HAVE_PLTE;
			}
	png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,		png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,
	chunk_names, chunk_count);		chunk_names, chunk_count);
	png_set_unknown_chunks(write_ptr, write_info, unknowns, chunk_count);		png_set_unknown_chunks(write_ptr, write_info, unknowns, chunk_count);
	// XXX I can't get this to work without forcibly changing		#if PNG_LIBPNG_VER < 10600
	// the location to what I want... which apparently is supposed		/* Deal with unknown chunk location bug in 1.5.x and earlier */
	// to be a private API, but everything else I have tried results
	// in the location being set to what I -last- wrote so I never
	// get written. :p
	png_set_unknown_chunk_location(write_ptr, write_info, 0, PNG_HAVE_PLTE);		png_set_unknown_chunk_location(write_ptr, write_info, 0, PNG_HAVE_PLTE);
	if (imageInfo.haveLayoutBounds) {		if (imageInfo.haveLayoutBounds) {
	png_set_unknown_chunk_location(write_ptr, write_info, 1, PNG_HAVE_PLTE);		png_set_unknown_chunk_location(write_ptr, write_info, 1, PNG_HAVE_PLTE);
	}		}
			#endif
	}		}


	@@ -1094,7 +1095,9 @@ static void write_png(const char* imageName,

	png_bytepp rows;		png_bytepp rows;
	if (color_type == PNG_COLOR_TYPE_RGB \|\| color_type == PNG_COLOR_TYPE_RGB_ALPHA) {		if (color_type == PNG_COLOR_TYPE_RGB \|\| color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
			if (color_type == PNG_COLOR_TYPE_RGB) {
	png_set_filler(write_ptr, 0, PNG_FILLER_AFTER);		png_set_filler(write_ptr, 0, PNG_FILLER_AFTER);
			}
	rows = imageInfo.rows;		rows = imageInfo.rows;
	} else {		} else {
	rows = outRows;		rows = outRows;