Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- ZoneMinder-1.24.0/src/zm_image.cpp.orig 2010-02-15 10:47:41.000000000 +0300
- +++ ZoneMinder-1.24.0/src/zm_image.cpp 2010-02-15 10:49:14.000000000 +0300
- @@ -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;
- --- ZoneMinder-1.24.0/src/zm_jpeg.c.orig 2010-02-15 10:47:41.000000000 +0300
- +++ ZoneMinder-1.24.0/src/zm_jpeg.c 2010-02-15 10:49:24.000000000 +0300
- @@ -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,12 +350,12 @@
- * 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;
- /* The source object and input buffer are made permanent so that a series
- - * of JPEG images can be read from the same file by calling jpeg_mem_src
- + * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
- * only before the first one. (If we discarded the buffer at the end of
- * one image, we'd likely lose the start of the next one.)
- * This makes it unsafe to use this manager and a different source
- --- ZoneMinder-1.24.0/src/zm_jpeg.h.orig 2010-02-15 10:47:41.000000000 +0300
- +++ ZoneMinder-1.24.0/src/zm_jpeg.h 2010-02-15 10:49:40.000000000 +0300
- @@ -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 );
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement