mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-16 02:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated JPEG memory functions to not conflict with new libjpeg8 functions.

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3012 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan
2010-01-20 14:43:54 +00:00
parent 5696516092
commit 2c9eeef178
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_image.cpp
View File

@@ -461,7 +461,7 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size )
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 @@ bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_over
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;

6
src/zm_jpeg.c
View File

@@ -172,7 +172,7 @@ static void term_destination (j_compress_ptr cinfo)
* 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;
@@ -349,12 +349,12 @@ static void term_source (j_decompress_ptr cinfo)
* 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

4
src/zm_jpeg.h
View File

@@ -36,5 +36,5 @@ void zm_jpeg_error_exit( j_common_ptr cinfo );
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 );