1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
Description: Patch for libpng1.6's changed API
Author: Tobias Frost <tobi@debian.org>
Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/pull/293
Last-Update: 2016-02-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/neo/renderer/Image_files.cpp
+++ b/neo/renderer/Image_files.cpp
@@ -621,6 +621,7 @@
extern "C"
{
+#include <string.h>
#include <png.h>
@@ -636,9 +637,12 @@
static void png_ReadData( png_structp pngPtr, png_bytep data, png_size_t length )
{
- memcpy( data, ( byte* )pngPtr->io_ptr, length );
-
- pngPtr->io_ptr = ( ( byte* ) pngPtr->io_ptr ) + length;
+
+ // There is a get_io_ptr but not a set_io_ptr.. Therefore we need some tmp storage here.
+ byte **ioptr = (byte **)png_get_io_ptr(pngPtr);
+
+ memcpy( data, *ioptr, length );
+ *ioptr += length;
}
}
@@ -651,6 +655,7 @@
static void LoadPNG( const char* filename, unsigned char** pic, int* width, int* height, ID_TIME_T* timestamp )
{
byte* fbuffer;
+ byte* readptr;
if( !pic )
{
@@ -683,7 +688,8 @@
common->Error( "LoadPNG( %s ): png_create_info_struct failed", filename );
}
- png_set_read_fn( pngPtr, fbuffer, png_ReadData );
+ readptr = fbuffer;
+ png_set_read_fn( pngPtr, &readptr, png_ReadData );
png_set_sig_bytes( pngPtr, 0 );
@@ -770,10 +776,11 @@
static int png_compressedSize = 0;
static void png_WriteData( png_structp pngPtr, png_bytep data, png_size_t length )
{
- memcpy( ( byte* )pngPtr->io_ptr, data, length );
-
- pngPtr->io_ptr = ( ( byte* ) pngPtr->io_ptr ) + length;
+ byte **ioptr = (byte**)png_get_io_ptr(pngPtr);
+
+ memcpy( *ioptr, data, length );
+ *ioptr += length;
png_compressedSize += length;
}
@@ -802,7 +809,8 @@
png_compressedSize = 0;
byte* buffer = ( byte* ) Mem_Alloc( width * height * bytesPerPixel, TAG_TEMP );
- png_set_write_fn( pngPtr, buffer, png_WriteData, png_FlushData );
+ byte* ioptr = buffer;
+ png_set_write_fn( pngPtr, &ioptr, png_WriteData, png_FlushData );
if( bytesPerPixel == 4 )
{
|