← Back to branch summary

~ubuntu-branches/ubuntu/natty/zoneminder/natty

« back to all changes in this revision

Viewing changes to debian/patches/08_jpeg8.dpatch

  • Committer: Bazaar Package Importer
  • Date: 2010-04-26 15:02:10 UTC
  • Revision ID: james.westby@ubuntu.com-20100426150210-90m1jtulrg8th17t
Tags: 1.24.2-3
Import packaging changes for version 1.24.2-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/08_jpeg8.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 08_jpeg8.dpatch by  <pjh@rhuiden.nridge.com.au>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
@DPATCH@
 
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
 
11
@@ -461,7 +461,7 @@
 
12
                return( false );
 
13
        }
 
14
 
 
15
-       jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
 
16
+       zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
 
17
 
 
18
        jpeg_read_header( cinfo, TRUE );
 
19
 
 
20
@@ -523,7 +523,7 @@
 
21
                jpeg_create_compress( cinfo );
 
22
        }
 
23
 
 
24
-       jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
 
25
+       zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
 
26
 
 
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
 
32
@@ -173,7 +173,7 @@
 
33
  * for closing it after finishing compression.
 
34
  */
 
35
 
 
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 )
 
38
 {
 
39
     mem_dest_ptr dest;
 
40
 
 
41
@@ -350,7 +350,7 @@
 
42
  * for closing it after finishing decompression.
 
43
  */
 
44
 
 
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 )
 
47
 {
 
48
     mem_src_ptr src;
 
49
 
 
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
 
53
@@ -36,5 +36,5 @@
 
54
 void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
 
55
 
 
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 );