qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean out silly typedef bloat, clean up whitespace.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2003-09-08 20:07:51 +00:00
parent f93cc0d5d5
commit 387f6a6f64
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
libs/image/png.c
View file

@ -52,9 +52,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "compat.h" #include "compat.h"
typedef unsigned char uch;
typedef unsigned short ush;
typedef unsigned long ulg;
/* Qread wrapper for libpng */ /* Qread wrapper for libpng */
static void static void
@ -67,16 +64,17 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length)
static int static int
readpng_init (QFile *infile, png_structp *png_ptr, png_infop *info_ptr) readpng_init (QFile *infile, png_structp *png_ptr, png_infop *info_ptr)
{ {
uch sig[8]; unsigned char sig[8];
/* Check the signiture */ /* Check the signiture */
Qread (infile, sig, 8); Qread (infile, sig, 8);
if (!png_check_sig(sig, 8)) { if (!png_check_sig (sig, 8)) {
Sys_Printf ("Bad png file\n"); Sys_Printf ("Bad png file\n");
return (1); return (1);
} }
*png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); *png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL,
NULL);
if (!*png_ptr) if (!*png_ptr)
return (2); /* Out of memory! */ return (2); /* Out of memory! */
@ -89,7 +87,7 @@ readpng_init (QFile *infile, png_structp *png_ptr, png_infop *info_ptr)
/* setjmp() must be called in every function that calls a PNG-reading /* setjmp() must be called in every function that calls a PNG-reading
* libpng function */ * libpng function */
if (setjmp(png_jmpbuf(*png_ptr))) { if (setjmp (png_jmpbuf (*png_ptr))) {
png_destroy_read_struct (png_ptr, info_ptr, NULL); png_destroy_read_struct (png_ptr, info_ptr, NULL);
return (4); return (4);
} }
@ -108,19 +106,19 @@ readpng_init (QFile *infile, png_structp *png_ptr, png_infop *info_ptr)
tex_t * tex_t *
LoadPNG (QFile *infile) LoadPNG (QFile *infile)
{ {
double gamma; double gamma;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_uint_32 i, rowbytes; png_uint_32 height, width, rowbytes, i;
png_bytepp row_pointers = NULL; png_bytepp row_pointers = NULL;
png_uint_32 width, height; int bit_depth, color_type;
int bit_depth, color_type; tex_t *tex;
tex_t *tex;
if (readpng_init(infile, &png_ptr, &info_ptr) != 0) if (readpng_init (infile, &png_ptr, &info_ptr) != 0)
return (NULL); return (NULL);
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
NULL, NULL, NULL);
if (color_type == PNG_COLOR_TYPE_PALETTE) if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand (png_ptr); png_set_expand (png_ptr);
@ -128,13 +126,14 @@ LoadPNG (QFile *infile)
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
png_set_expand (png_ptr); png_set_expand (png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_expand (png_ptr); png_set_expand (png_ptr);
if (bit_depth == 16) if (bit_depth == 16)
png_set_strip_16 (png_ptr); png_set_strip_16 (png_ptr);
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) if (color_type == PNG_COLOR_TYPE_GRAY
|| color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
png_set_gray_to_rgb (png_ptr); png_set_gray_to_rgb (png_ptr);
/* NOTE: gamma support? */ /* NOTE: gamma support? */
@ -145,7 +144,8 @@ LoadPNG (QFile *infile)
if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) if (!png_get_gAMA(png_ptr, info_ptr, &gamma))
png_set_gamma (png_ptr, 1.0, gamma); png_set_gamma (png_ptr, 1.0, gamma);
/* All transformations have been registered, now update the info_ptr structure */ /* All transformations have been registered, now update the info_ptr
* structure */
png_read_update_info (png_ptr, info_ptr); png_read_update_info (png_ptr, info_ptr);
/* Allocate tex_t structure */ /* Allocate tex_t structure */
@ -160,7 +160,8 @@ LoadPNG (QFile *infile)
tex->format = tex_rgb; tex->format = tex_rgb;
tex->palette = NULL; tex->palette = NULL;
if ((row_pointers = (png_bytepp)malloc(height * sizeof(png_bytep))) == NULL) { if ((row_pointers = (png_bytepp) malloc (height * sizeof (png_bytep)))
== NULL) {
png_destroy_read_struct (&png_ptr, &info_ptr, NULL); png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
return (NULL); /* Out of memory */ return (NULL); /* Out of memory */
} }
@ -169,12 +170,12 @@ LoadPNG (QFile *infile)
row_pointers[i] = tex->data + (i * rowbytes); row_pointers[i] = tex->data + (i * rowbytes);
/* Now we can go ahead and read the whole image */ /* Now we can go ahead and read the whole image */
png_read_image(png_ptr, row_pointers); png_read_image (png_ptr, row_pointers);
free(row_pointers); free (row_pointers);
row_pointers = NULL; row_pointers = NULL;
png_read_end(png_ptr, NULL); png_read_end (png_ptr, NULL);
return (tex); return (tex);
} }