Files
@ r2980:c0fb57e5b1da
Branch filter:
Location: cpp/openttd-patchpack/source/os/macosx/splash.c - annotation
r2980:c0fb57e5b1da
3.3 KiB
text/x-c
(svn r3555) -Codechange: [Big Endian] removed defining OTTD_ALIGNMENT by default on Big Endian CPUs
this increased speed when reading unaligned data (like strings)
test showed this to increase speed by 5,6% when drawing the mini map on PPC OSX
the tradeoff is that now it will crash if a Big Endian computer don't support unaligned reading
but it should easily fixable in stdafx.h if it turns out to be a problem
this increased speed when reading unaligned data (like strings)
test showed this to increase speed by 5,6% when drawing the mini map on PPC OSX
the tradeoff is that now it will crash if a Big Endian computer don't support unaligned reading
but it should easily fixable in stdafx.h if it turns out to be a problem
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | r2847:8df2aeef9e0e r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2953:a59e10678800 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f | /* $Id$ */
#include "../../stdafx.h"
#include "../../openttd.h"
#include "../../variables.h"
#include "../../macros.h"
#include "../../debug.h"
#include "../../functions.h"
#include "../../gfx.h"
#include "../../fileio.h"
#include "splash.h"
#ifdef WITH_PNG
#include <png.h>
static void PNGAPI png_my_error(png_structp png_ptr, png_const_charp message)
{
DEBUG(misc, 0) ("ERROR(libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr));
longjmp(png_ptr->jmpbuf, 1);
}
static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message)
{
DEBUG(misc, 0) ("WARNING(libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr));
}
void DisplaySplashImage(void)
{
png_byte header[8];
FILE *f;
png_structp png_ptr;
png_infop info_ptr, end_info;
uint width, height, bit_depth, color_type;
png_colorp palette;
int num_palette;
png_bytep *row_pointers;
uint8 *src, *dst;
uint y;
uint xoff, yoff;
int i;
f = FioFOpenFile(SPLASH_IMAGE_FILE);
if (f == NULL) return;
fread(header, 1, 8, f);
if (png_sig_cmp(header, 0, 8) != 0) {
fclose(f);
return;
}
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, (png_voidp) NULL, png_my_error, png_my_warning);
if (png_ptr == NULL) {
fclose(f);
return;
}
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
fclose(f);
return;
}
end_info = png_create_info_struct(png_ptr);
if (end_info == NULL) {
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(f);
return;
}
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(f);
return;
}
png_init_io(png_ptr, f);
png_set_sig_bytes(png_ptr, 8);
png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
width = png_get_image_width(png_ptr, info_ptr);
height = png_get_image_height(png_ptr, info_ptr);
bit_depth = png_get_bit_depth(png_ptr, info_ptr);
color_type = png_get_color_type(png_ptr, info_ptr);
if (color_type != PNG_COLOR_TYPE_PALETTE || bit_depth != 8) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(f);
return;
}
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(f);
return;
}
png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
row_pointers = png_get_rows(png_ptr, info_ptr);
memset(_screen.dst_ptr, 0xff, _screen.pitch * _screen.height);
if (width > (uint) _screen.width) width = _screen.width;
if (height > (uint) _screen.height) height = _screen.height;
xoff = (_screen.width - width) / 2;
yoff = (_screen.height - height) / 2;
for (y = 0; y < height; y++) {
src = row_pointers[y];
dst = ((uint8 *) _screen.dst_ptr) + (yoff + y) * _screen.pitch + xoff;
memcpy(dst, src, width);
}
for (i = 0; i < num_palette; i++) {
_cur_palette[i].r = palette[i].red;
_cur_palette[i].g = palette[i].green;
_cur_palette[i].b = palette[i].blue;
}
_cur_palette[0xff].r = 0;
_cur_palette[0xff].g = 0;
_cur_palette[0xff].b = 0;
_pal_first_dirty = 0;
_pal_last_dirty = 0xff;
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(f);
return;
}
#else // WITH_PNG
void DisplaySplashImage(void) {}
#endif // WITH_PNG
|