X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=jpeg.c;h=4934b75899220afaa8820512e42a8c418abe1f37;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=45a2c32b56040932b2e501eca6bf62d383cf6c83;hpb=9dc8149ee231682452a52a4ec4bdee3981da5492;p=xonotic%2Fdarkplaces.git

diff --git a/jpeg.c b/jpeg.c
index 45a2c32b..4934b758 100644
--- a/jpeg.c
+++ b/jpeg.c
@@ -397,7 +397,9 @@ qboolean JPEG_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
-#ifdef WIN32
+#if defined(WIN64)
+		"libjpeg64.dll",
+#elif defined(WIN32)
 		"libjpeg.dll",
 #elif defined(MACOSX)
 		"libjpeg.62.dylib",
@@ -468,9 +470,9 @@ static void JPEG_SkipInputData (j_decompress_ptr cinfo, long num_bytes)
     cinfo->src->bytes_in_buffer -= num_bytes;
 }
 
-static void JPEG_MemSrc (j_decompress_ptr cinfo, qbyte *buffer)
+static void JPEG_MemSrc (j_decompress_ptr cinfo, const qbyte *buffer)
 {
-	cinfo->src = cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr));
+	cinfo->src = (struct jpeg_source_mgr *)cinfo->mem->alloc_small ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr));
 
 	cinfo->src->next_input_byte = buffer;
 	cinfo->src->bytes_in_buffer = fs_filesize;
@@ -496,7 +498,7 @@ JPEG_LoadImage
 Load a JPEG image into a RGBA buffer
 ====================
 */
-qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight)
+qbyte* JPEG_LoadImage (const qbyte *f, int matchwidth, int matchheight)
 {
 	struct jpeg_decompress_struct cinfo;
 	struct jpeg_error_mgr jerr;
@@ -528,8 +530,8 @@ qbyte* JPEG_LoadImage (qbyte *f, int matchwidth, int matchheight)
 		return NULL;
 	}
 
-	image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
-	scanline = Mem_Alloc(tempmempool, image_width * cinfo.output_components);
+	image_rgba = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+	scanline = (qbyte *)Mem_Alloc(tempmempool, image_width * cinfo.output_components);
 	if (!image_rgba || !scanline)
 	{
 		if (!image_rgba)
@@ -628,7 +630,7 @@ static void JPEG_TermDestination (j_compress_ptr cinfo)
 
 	// Write any data remaining in the buffer
 	if (datacount > 0)
-		if (FS_Write (dest->outfile, dest->buffer, datacount) != datacount)
+		if (FS_Write (dest->outfile, dest->buffer, datacount) != (fs_offset_t)datacount)
 			error_in_jpeg = true;
 }