simtactics/mysimulation
1
0
Fork 0
mirror of https://github.com/simtactics/mysimulation.git synced 2025-07-05 22:20:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

temp hack to get jpeg turbo going

Browse source
This commit is contained in:
Jip 2024-05-03 02:40:50 +02:00
parent b99359078e
commit 7189dfbd9c
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
library/formats/Image.cpp
View file

@ -17,8 +17,8 @@
*/
#include "FileHandler.h"
//#include <jpeglib.h>
//#include <jerror.h>
#include <jpeglib.h>
#include <jerror.h>
#include <png.h>
#include <setjmp.h> //Used for libpng
#include "bmp/read_bmp.h"
@ -120,7 +120,6 @@ static uint8_t * ReadBMP(Image_t * Image, const uint8_t * InData, size_t FileSiz
// libjpeg-turbo v6 doesn't support jpeg_mem_src, so we have to implement it here
/*
static void term_source(j_decompress_ptr){}
static int fill_mem_input_buffer(j_decompress_ptr cinfo){
ERREXIT(cinfo, JERR_FILE_READ);
@ -137,10 +136,8 @@ static void skip_input_data(j_decompress_ptr cinfo, long bytes)
src->next_input_byte += bytes;
src->bytes_in_buffer -= bytes;
}
*/
static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){
/*
//Initialize
jpeg_decompress_struct cinfo;
jpeg_error_mgr jerr;
@ -201,8 +198,6 @@ static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSiz
Image->Data = OutData;
}
return OutData;
*/
return NULL;
}
struct pngdata_t {