[quake3-commits] r1941 - in trunk/code: game renderer
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Apr 13 19:42:55 EDT 2011
Author: thilo
Date: 2011-04-13 19:42:55 -0400 (Wed, 13 Apr 2011)
New Revision: 1941
Modified:
trunk/code/game/g_main.c
trunk/code/renderer/tr_image_jpg.c
Log:
Fix a few comments (#4591)
Modified: trunk/code/game/g_main.c
===================================================================
--- trunk/code/game/g_main.c 2011-04-09 12:33:56 UTC (rev 1940)
+++ trunk/code/game/g_main.c 2011-04-13 23:42:55 UTC (rev 1941)
@@ -618,7 +618,7 @@
/*
=======================
-RequeueTournamentLoser
+AddTournamentQueue
Add client to end of tournament queue
=======================
Modified: trunk/code/renderer/tr_image_jpg.c
===================================================================
--- trunk/code/renderer/tr_image_jpg.c 2011-04-09 12:33:56 UTC (rev 1940)
+++ trunk/code/renderer/tr_image_jpg.c 2011-04-13 23:42:55 UTC (rev 1941)
@@ -137,6 +137,10 @@
/* 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 */
@@ -195,14 +199,10 @@
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;
More information about the quake3-commits
mailing list