Advertisement
Guest User

Untitled

a guest
May 15th, 2010
492
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.52 KB | None | 0 0
  1. --- ZoneMinder-1.24.0/src/zm_image.cpp.orig 2010-02-15 10:47:41.000000000 +0300
  2. +++ ZoneMinder-1.24.0/src/zm_image.cpp 2010-02-15 10:49:14.000000000 +0300
  3. @@ -461,7 +461,7 @@
  4. return( false );
  5. }
  6.  
  7. - jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
  8. + zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
  9.  
  10. jpeg_read_header( cinfo, TRUE );
  11.  
  12. @@ -523,7 +523,7 @@
  13. jpeg_create_compress( cinfo );
  14. }
  15.  
  16. - jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
  17. + zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
  18.  
  19. cinfo->image_width = width; /* image width and height, in pixels */
  20. cinfo->image_height = height;
  21.  
  22. --- ZoneMinder-1.24.0/src/zm_jpeg.c.orig 2010-02-15 10:47:41.000000000 +0300
  23. +++ ZoneMinder-1.24.0/src/zm_jpeg.c 2010-02-15 10:49:24.000000000 +0300
  24. @@ -173,7 +173,7 @@
  25. * for closing it after finishing compression.
  26. */
  27.  
  28. -void jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
  29. +void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
  30. {
  31. mem_dest_ptr dest;
  32.  
  33. @@ -350,12 +350,12 @@
  34. * for closing it after finishing decompression.
  35. */
  36.  
  37. -void jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
  38. +void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
  39. {
  40. mem_src_ptr src;
  41.  
  42. /* The source object and input buffer are made permanent so that a series
  43. - * of JPEG images can be read from the same file by calling jpeg_mem_src
  44. + * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
  45. * only before the first one. (If we discarded the buffer at the end of
  46. * one image, we'd likely lose the start of the next one.)
  47. * This makes it unsafe to use this manager and a different source
  48.  
  49. --- ZoneMinder-1.24.0/src/zm_jpeg.h.orig 2010-02-15 10:47:41.000000000 +0300
  50. +++ ZoneMinder-1.24.0/src/zm_jpeg.h 2010-02-15 10:49:40.000000000 +0300
  51. @@ -36,5 +36,5 @@
  52. void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
  53.  
  54. // Prototypes for memory compress/decompression object */
  55. -void jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
  56. -void jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
  57. +void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
  58. +void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement