OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved r_interpolate.cpp and r_translate.cpp to r_data.

Browse source 
- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.


SVN r3255 (trunk)
This commit is contained in:
Christoph Oelckers 2011-07-06 08:50:15 +00:00
commit fbff5ca932
51 changed files with 87 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/textures/jpegtexture.cpp
View file

@ -33,15 +33,35 @@
**
*/
#include <stdio.h>
extern "C"
{
#include <jpeglib.h>
}
#include "doomtype.h"
#include "files.h"
#include "r_jpeg.h"
#include "w_wad.h"
#include "v_text.h"
#include "bitmap.h"
#include "v_video.h"
#include "textures/textures.h"
struct FLumpSourceMgr : public jpeg_source_mgr
{
FileReader *Lump;
JOCTET Buffer[4096];
bool StartOfFile;
FLumpSourceMgr (FileReader *lump, j_decompress_ptr cinfo);
static void InitSource (j_decompress_ptr cinfo);
static boolean FillInputBuffer (j_decompress_ptr cinfo);
static void SkipInputData (j_decompress_ptr cinfo, long num_bytes);
static void TermSource (j_decompress_ptr cinfo);
};
//==========================================================================
//
//