diff options
author | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2007-09-05 22:05:32 +0000 |
commit | c99975c73ae2941751d86d3b8466454c5ad122c0 (patch) | |
tree | b5bb65655fbdbc22201426046092939bcf696abe /src/jpeg-6/jcmainct.c | |
parent | 27ad2c0e19891f7f2454c9eedf76878dc1942ba6 (diff) |
* Merge of ioq3-r1163
+ SDL everywhere
+ New R_LoadImage
+ net_ip.c
+ Window icon
+ GUI based dedicated server support
+ Compile time linked OpenGL
* Remove ui_menuFiles cvar
Diffstat (limited to 'src/jpeg-6/jcmainct.c')
-rw-r--r-- | src/jpeg-6/jcmainct.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/jpeg-6/jcmainct.c b/src/jpeg-6/jcmainct.c index 42a02d09..aa8ba9b5 100644 --- a/src/jpeg-6/jcmainct.c +++ b/src/jpeg-6/jcmainct.c @@ -68,7 +68,6 @@ METHODDEF void process_data_buffer_main METHODDEF void start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode) { - // bk001204 - don't use main... my_main_ptr jmain = (my_main_ptr) cinfo->main; /* Do nothing in raw-data mode. */ @@ -115,7 +114,6 @@ process_data_simple_main (j_compress_ptr cinfo, JSAMPARRAY input_buf, JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail) { - // bk001204 - don't use main my_main_ptr jmain = (my_main_ptr) cinfo->main; while (jmain->cur_iMCU_row < cinfo->total_iMCU_rows) { @@ -246,7 +244,6 @@ process_data_buffer_main (j_compress_ptr cinfo, GLOBAL void jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer) { - // bk001204 - don't use main my_main_ptr jmain; int ci; jpeg_component_info *compptr; |