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
|
--- ZoneMinder-1.24.2/src/zm_jpeg.h~ 2009-03-20 13:07:00.000000000 +0100
+++ ZoneMinder-1.24.2/src/zm_jpeg.h 2010-02-09 22:58:08.576509968 +0100
@@ -36,5 +36,5 @@
void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
// Prototypes for memory compress/decompression object */
-void jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
-void jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
+void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
+void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
--- ZoneMinder-1.24.2/src/zm_jpeg.c~ 2009-03-20 13:07:00.000000000 +0100
+++ ZoneMinder-1.24.2/src/zm_jpeg.c 2010-02-09 22:58:34.660048754 +0100
@@ -173,7 +173,7 @@
* for closing it after finishing compression.
*/
-void jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
+void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
{
mem_dest_ptr dest;
@@ -350,7 +350,7 @@
* for closing it after finishing decompression.
*/
-void jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
+void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
{
mem_src_ptr src;
--- ZoneMinder-1.24.2/src/zm_image.cpp~ 2009-05-25 20:04:00.000000000 +0200
+++ ZoneMinder-1.24.2/src/zm_image.cpp 2010-02-09 22:58:53.219635716 +0100
@@ -461,7 +461,7 @@
return( false );
}
- jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
+ zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
jpeg_read_header( cinfo, TRUE );
@@ -523,7 +523,7 @@
jpeg_create_compress( cinfo );
}
- jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
+ zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
cinfo->image_width = width; /* image width and height, in pixels */
cinfo->image_height = height;
|
