X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=image.cpp;h=4da9c1339696bc565678a9fce53cdb37ccb420ba;hb=93dfad1dc7e20d694e2c8b63515bff8ae91f3700;hp=922c4d432ae1616f0a4db1b14410adc9f128603a;hpb=b1f5ff67936c369bd25a65d996d47c1606d7f87d;p=apitrace diff --git a/image.cpp b/image.cpp index 922c4d4..4da9c13 100644 --- a/image.cpp +++ b/image.cpp @@ -1,5 +1,6 @@ /************************************************************************** * + * Copyright 2011 Jose Fonseca * Copyright 2008-2010 VMware, Inc. * All Rights Reserved. * @@ -24,14 +25,8 @@ **************************************************************************/ -#include -#include - +#include #include -#include -#include - -#include #include "image.hpp" @@ -39,260 +34,26 @@ namespace Image { -#pragma pack(push,2) -struct FileHeader { - uint16_t bfType; - uint32_t bfSize; - uint16_t bfReserved1; - uint16_t bfReserved2; - uint32_t bfOffBits; -}; -#pragma pack(pop) - -struct InfoHeader { - uint32_t biSize; - int32_t biWidth; - int32_t biHeight; - uint16_t biPlanes; - uint16_t biBitCount; - uint32_t biCompression; - uint32_t biSizeImage; - int32_t biXPelsPerMeter; - int32_t biYPelsPerMeter; - uint32_t biClrUsed; - uint32_t biClrImportant; -}; - -struct Pixel { - uint8_t rgbBlue; - uint8_t rgbGreen; - uint8_t rgbRed; - uint8_t rgbAlpha; -}; - - -bool -Image::writeBMP(const char *filename) const { - struct FileHeader bmfh; - struct InfoHeader bmih; - unsigned x, y; - - bmfh.bfType = 0x4d42; - bmfh.bfSize = 14 + 40 + height*width*4; - bmfh.bfReserved1 = 0; - bmfh.bfReserved2 = 0; - bmfh.bfOffBits = 14 + 40; - - bmih.biSize = 40; - bmih.biWidth = width; - bmih.biHeight = height; - bmih.biPlanes = 1; - bmih.biBitCount = 32; - bmih.biCompression = 0; - bmih.biSizeImage = height*width*4; - bmih.biXPelsPerMeter = 0; - bmih.biYPelsPerMeter = 0; - bmih.biClrUsed = 0; - bmih.biClrImportant = 0; - - std::ofstream stream(filename, std::ofstream::binary); - - if (!stream) - return false; - - stream.write((const char *)&bmfh, 14); - stream.write((const char *)&bmih, 40); - - unsigned stride = width*4; - - if (flipped) { - for (y = 0; y < height; ++y) { - const unsigned char *ptr = pixels + y * stride; - for (x = 0; x < width; ++x) { - struct Pixel pixel; - pixel.rgbRed = ptr[x*4 + 0]; - pixel.rgbGreen = ptr[x*4 + 1]; - pixel.rgbBlue = ptr[x*4 + 2]; - pixel.rgbAlpha = ptr[x*4 + 3]; - stream.write((const char *)&pixel, 4); - } - } - } else { - y = height; - while (y--) { - const unsigned char *ptr = pixels + y * stride; - for (x = 0; x < width; ++x) { - struct Pixel pixel; - pixel.rgbRed = ptr[x*4 + 0]; - pixel.rgbGreen = ptr[x*4 + 1]; - pixel.rgbBlue = ptr[x*4 + 2]; - pixel.rgbAlpha = ptr[x*4 + 3]; - stream.write((const char *)&pixel, 4); - } - } - } - - stream.close(); - - return true; -} - -bool -Image::writePNG(const char *filename) const { - FILE *fp; - png_structp png_ptr; - png_infop info_ptr; - - fp = fopen(filename, "wb"); - if (!fp) - goto no_fp; - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - goto no_png; - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_write_struct(&png_ptr, NULL); - goto no_png; - } - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - goto no_png; - } - - png_init_io(png_ptr, fp); - - png_set_IHDR(png_ptr, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGB_ALPHA, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_set_compression_level(png_ptr, Z_DEFAULT_COMPRESSION); - - png_write_info(png_ptr, info_ptr); - - if (!flipped) { - for (unsigned y = 0; y < height; ++y) { - png_bytep row = (png_bytep)(pixels + y*width*4); - png_write_rows(png_ptr, &row, 1); - } - } else { - unsigned y = height; - while (y--) { - png_bytep row = (png_bytep)(pixels + y*width*4); - png_write_rows(png_ptr, &row, 1); - } - } - - png_write_end(png_ptr, info_ptr); - png_destroy_write_struct(&png_ptr, &info_ptr); - - fclose(fp); - return true; - -no_png: - fclose(fp); -no_fp: - return false; -} - - -Image * -readPNG(const char *filename) -{ - FILE *fp; - png_structp png_ptr; - png_infop info_ptr; - png_infop end_info; - Image *image; - - fp = fopen(filename, "rb"); - if (!fp) - goto no_fp; - - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - goto no_png; - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_read_struct(&png_ptr, NULL, NULL); - goto no_png; - } - - end_info = png_create_info_struct(png_ptr); - if (!end_info) { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - goto no_png; - } - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - goto no_png; - } - - png_init_io(png_ptr, fp); - - png_read_info(png_ptr, info_ptr); - - png_uint_32 width, height; - int bit_depth, color_type, interlace_type, compression_type, filter_method; - - png_get_IHDR(png_ptr, info_ptr, - &width, &height, - &bit_depth, &color_type, &interlace_type, - &compression_type, &filter_method); - - image = new Image(width, height); - if (!image) - goto no_image; - - /* Convert to RGBA8 */ - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb(png_ptr); - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand_gray_1_2_4_to_8(png_ptr); - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(png_ptr); - if (bit_depth == 16) - png_set_strip_16(png_ptr); - - for (unsigned y = 0; y < height; ++y) { - png_bytep row = (png_bytep)(image->pixels + y*width*4); - png_read_row(png_ptr, row, NULL); - } - - png_read_end(png_ptr, info_ptr); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - fclose(fp); - return image; - -no_image: - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); -no_png: - fclose(fp); -no_fp: - return NULL; -} - - double Image::compare(Image &ref) { if (width != ref.width || - height != ref.height) { + height != ref.height || + channels != ref.channels) { return 0.0; } const unsigned char *pSrc = start(); const unsigned char *pRef = ref.start(); + assert(channels >= 3); + unsigned long long error = 0; for (unsigned y = 0; y < height; ++y) { for (unsigned x = 0; x < width; ++x) { // FIXME: Ignore alpha channel until we are able to pick a visual // that matches the traces for (unsigned c = 0; c < 3; ++c) { - int delta = pSrc[x*4 + c] - pRef[x*4 + c]; + int delta = pSrc[x*channels + c] - pRef[x*channels + c]; error += delta*delta; } } @@ -311,115 +72,5 @@ double Image::compare(Image &ref) return precision; } -struct png_tmp_buffer -{ - char *buffer; - size_t size; -}; - -static void -pngWriteCallback(png_structp png_ptr, png_bytep data, png_size_t length) -{ - struct png_tmp_buffer *buf = (struct png_tmp_buffer*) png_get_io_ptr(png_ptr); - size_t nsize = buf->size + length; - - /* allocate or grow buffer */ - if (buf->buffer) - buf->buffer = (char*)realloc(buf->buffer, nsize); - else - buf->buffer = (char*)malloc(nsize); - - if (!buf->buffer) - png_error(png_ptr, "Buffer allocation error"); - - memcpy(buf->buffer + buf->size, data, length); - buf->size += length; -} - -bool writePixelsToBuffer(unsigned char *pixels, - unsigned width, unsigned height, unsigned numChannels, - bool flipped, - char **buffer, - int *size) -{ - struct png_tmp_buffer png_mem; - png_structp png_ptr; - png_infop info_ptr; - int type; - - png_mem.buffer = NULL; - png_mem.size = 0; - - switch (numChannels) { - case 4: - type = PNG_COLOR_TYPE_RGB_ALPHA; - break; - case 3: - type = PNG_COLOR_TYPE_RGB; - break; - case 2: - type = PNG_COLOR_TYPE_GRAY_ALPHA; - break; - case 1: - type = PNG_COLOR_TYPE_GRAY; - break; - default: - goto no_png; - } - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - goto no_png; - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) { - png_destroy_write_struct(&png_ptr, NULL); - goto no_png; - } - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - goto no_png; - } - - png_set_write_fn(png_ptr, &png_mem, pngWriteCallback, NULL); - - png_set_IHDR(png_ptr, info_ptr, width, height, 8, - type, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_set_compression_level(png_ptr, Z_DEFAULT_COMPRESSION); - - png_write_info(png_ptr, info_ptr); - - if (!flipped) { - for (unsigned y = 0; y < height; ++y) { - png_bytep row = (png_bytep)(pixels + y*width*numChannels); - png_write_rows(png_ptr, &row, 1); - } - } else { - unsigned y = height; - while (y--) { - png_bytep row = (png_bytep)(pixels + y*width*numChannels); - png_write_rows(png_ptr, &row, 1); - } - } - - png_write_end(png_ptr, info_ptr); - png_destroy_write_struct(&png_ptr, &info_ptr); - - *buffer = png_mem.buffer; - *size = png_mem.size; - - return true; - -no_png: - *buffer = NULL; - *size = 0; - - if (png_mem.buffer) - free(png_mem.buffer); - return false; -} } /* namespace Image */