1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 08_jpeg8.dpatch by <pjh@rhuiden.nridge.com.au>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad Zoneminder-1.24.2~/src/zm_image.cpp Zoneminder-1.24.2/src/zm_image.cpp
9
--- Zoneminder-1.24.2~/src/zm_image.cpp 2009-08-13 15:55:30.000000000 +1000
10
+++ Zoneminder-1.24.2/src/zm_image.cpp 2010-03-09 20:28:16.000000000 +1100
15
- jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
16
+ zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
18
jpeg_read_header( cinfo, TRUE );
21
jpeg_create_compress( cinfo );
24
- jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
25
+ zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
27
cinfo->image_width = width; /* image width and height, in pixels */
28
cinfo->image_height = height;
29
diff -urNad Zoneminder-1.24.2~/src/zm_jpeg.c Zoneminder-1.24.2/src/zm_jpeg.c
30
--- Zoneminder-1.24.2~/src/zm_jpeg.c 2009-08-13 15:55:30.000000000 +1000
31
+++ Zoneminder-1.24.2/src/zm_jpeg.c 2010-03-09 20:28:16.000000000 +1100
33
* for closing it after finishing compression.
36
-void jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
37
+void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
42
* for closing it after finishing decompression.
45
-void jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
46
+void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
50
diff -urNad Zoneminder-1.24.2~/src/zm_jpeg.h Zoneminder-1.24.2/src/zm_jpeg.h
51
--- Zoneminder-1.24.2~/src/zm_jpeg.h 2009-08-13 15:55:30.000000000 +1000
52
+++ Zoneminder-1.24.2/src/zm_jpeg.h 2010-03-09 20:28:16.000000000 +1100
54
void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
56
// Prototypes for memory compress/decompression object */
57
-void jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
58
-void jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
59
+void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
60
+void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );