dmgr->free_in_buffer = 0;
}
-int jpeg_save(unsigned char*data, int width, int height, int quality, const char*filename)
+int jpeg_save(unsigned char*data, unsigned width, unsigned height, int quality, const char*filename)
{
struct jpeg_destination_mgr mgr;
struct jpeg_compress_struct cinfo;
return 1;
}
-int jpeg_save_gray(unsigned char*data, int width, int height, int quality, const char*filename)
+int jpeg_save_gray(unsigned char*data, unsigned width, unsigned height, int quality, const char*filename)
{
struct jpeg_destination_mgr mgr;
struct jpeg_compress_struct cinfo;
}
-int jpeg_save_to_file(unsigned char*data, int width, int height, int quality, FILE*_fi)
+int jpeg_save_to_file(unsigned char*data, unsigned width, unsigned height, int quality, FILE*_fi)
{
struct jpeg_destination_mgr mgr;
struct jpeg_compress_struct cinfo;
return 1;
}
-int jpeg_save_to_mem(unsigned char*data, int width, int height, int quality, unsigned char*_dest, int _destlen)
+int jpeg_save_to_mem(unsigned char*data, unsigned width, unsigned height, int quality, unsigned char*_dest, int _destlen)
{
struct jpeg_destination_mgr mgr;
struct jpeg_compress_struct cinfo;
//printf("term %d\n", size - mgr->bytes_in_buffer);
}
-int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char*dest, int width, int height)
+int jpeg_load_from_mem(unsigned char*_data, int _size, unsigned char**dest, unsigned*width, unsigned*height)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
struct jpeg_source_mgr mgr;
- int y,x;
data = _data;
size = _size;
cinfo.src = &mgr;
jpeg_read_header(&cinfo, TRUE);
+ cinfo.out_color_space == JCS_RGB;
jpeg_start_decompress(&cinfo);
+
+ *width = cinfo.output_width;
+ *height = cinfo.output_height;
+ *dest = malloc(cinfo.output_width * cinfo.output_height * 4);
- for(y=0;y<height;y++) {
- unsigned char*j = &dest[width*y*3];
- jpeg_read_scanlines(&cinfo,&j,1);
+ unsigned char*scanline = malloc(cinfo.output_width * 4);
+ int y;
+ for(y=0;y<cinfo.output_height;y++) {
+ unsigned char*to = &(*dest)[cinfo.output_width*y*4];
+ jpeg_read_scanlines(&cinfo,&scanline,1);
+ int x;
+ for(x=0;x<cinfo.output_width;x++) {
+ to[x*4 + 0] = 255;
+ to[x*4 + 1] = scanline[x*3 + 0];
+ to[x*4 + 2] = scanline[x*3 + 1];
+ to[x*4 + 3] = scanline[x*3 + 2];
+ }
}
+ free(scanline);
jpeg_finish_decompress(&cinfo);
jpeg_destroy_decompress(&cinfo);
typedef unsigned char U8;
-int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
+int jpeg_load(const char*filename, unsigned char**dest, unsigned*_width, unsigned*_height)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
U8*scanline = (U8 *)malloc(4 * cinfo.output_width);
- int width = *_width = cinfo.output_width;
- int height = *_height = cinfo.output_height;
- *dest = (unsigned char*)malloc(width*height*4);
+ unsigned int width = *_width = cinfo.output_width;
+ unsigned int height = *_height = cinfo.output_height;
+ unsigned long long int image_size = (unsigned long long)width * height * 4;
+ if(image_size > 0xffffffff) {
+ *_width = 0;
+ *_height = 0;
+ return 0;
+ }
+ *dest = (unsigned char*)malloc(image_size);
int y;
for (y=0;y<height;y++) {
return 1;
}
-void jpeg_get_size(const char *filename, int *width, int *height)
+void jpeg_get_size(const char *filename, unsigned *width, unsigned*height)
{
struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr;
#else
-int jpeg_save(unsigned char*data, int width, int height, int quality, const char*filename)
+int jpeg_save(unsigned char*data, unsigned width, unsigned height, int quality, const char*filename)
{
fprintf(stderr, "jpeg_save: No JPEG support compiled in\n");
return 0;
}
-int jpeg_save_to_file(unsigned char*data, int width, int height, int quality, FILE*fi)
+int jpeg_save_to_file(unsigned char*data, unsigned width, unsigned height, int quality, FILE*fi)
{
fprintf(stderr, "jpeg_save_to_file: No JPEG support compiled in\n");
return 0;
}
-int jpeg_save_to_mem(unsigned char*data, int width, int height, int quality, unsigned char*dest, int destsize)
+int jpeg_save_to_mem(unsigned char*data, unsigned width, unsigned height, int quality, unsigned char*dest, int destsize)
{
fprintf(stderr, "jpeg_save_tomem: No JPEG support compiled in\n");
return 0;
}
-int jpeg_load_from_mem(unsigned char*_data, int size, unsigned char*dest, int width, int height)
+int jpeg_load_from_mem(unsigned char*_data, int size, unsigned char*dest, unsigned width, unsigned height)
{
fprintf(stderr, "jpeg_load_from_mem: No JPEG support compiled in\n");
return 0;
}
-int jpeg_load(const char*filename, unsigned char**dest, int*_width, int*_height)
+int jpeg_load(const char*filename, unsigned char**dest, unsigned*_width, unsigned*_height)
{
fprintf(stderr, "jpeg_load: No JPEG support compiled in\n");
return 0;
}
-void jpeg_get_size(const char *fname, int *width, int *height)
+void jpeg_get_size(const char *fname, unsigned *width, unsigned *height)
{
*width = 0;
*height = 0;