Skip to content

Commit

Permalink
Fix a few comments (#4591)
Browse files Browse the repository at this point in the history
  • Loading branch information
Thilo Schulz committed Apr 13, 2011
1 parent 01a274b commit e5c2102
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/game/g_main.c
Expand Up @@ -618,7 +618,7 @@ void AddTournamentPlayer( void ) {

/*
=======================
RequeueTournamentLoser
AddTournamentQueue
Add client to end of tournament queue
=======================
Expand Down
10 changes: 5 additions & 5 deletions code/renderer/tr_image_jpg.c
Expand Up @@ -137,6 +137,10 @@ void R_LoadJPG(const char *filename, unsigned char **pic, int *width, int *heigh

/* Step 4: set parameters for decompression */

/*
* Make sure it always converts images to RGB color space. This will
* automatically convert 8-bit greyscale images to RGB as well.
*/
cinfo.out_color_space = JCS_RGB;

/* Step 5: Start decompressor */
Expand Down Expand Up @@ -195,14 +199,10 @@ void R_LoadJPG(const char *filename, unsigned char **pic, int *width, int *heigh

buf = out;

// If we are processing an 8-bit JPEG (greyscale), we'll have to convert
// the greyscale values to RGBA.
// Expand from RGB to RGBA
sindex = pixelcount * cinfo.output_components;
dindex = memcount;

// Only pixelcount number of bytes have been written.
// Expand the color values over the rest of the buffer, starting
// from the end.
do
{
buf[--dindex] = 255;
Expand Down

0 comments on commit e5c2102

Please sign in to comment.