From dcfc6ccdbfacf890d15b9f6090e1fac310f211fd Mon Sep 17 00:00:00 2001 From: Chris Liddell Date: Fri, 2 Mar 2012 11:50:41 +0000 Subject: Bug 692891: don't hack the libjpeg mem manager.... When linking with a shared libjpeg library, don't include the non-public libjpeg API hack to replace it's low level memory manager with Ghostscript's. But still do so when using our "local" libjpeg source. No cluster differences. --- gs/base/sjpegc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gs/base/sjpegc.c b/gs/base/sjpegc.c index b050191c8..7ab7e03a1 100644 --- a/gs/base/sjpegc.c +++ b/gs/base/sjpegc.c @@ -35,6 +35,9 @@ */ #include "gconfig_.h" + +#if SHARE_JPEG == 0 +/* Don't use the non-public insterface if we're linking to a shared lib */ #ifdef DONT_HAVE_JMEMSYS_H void * @@ -67,6 +70,7 @@ jpeg_mem_term(j_common_ptr cinfo); #else #include "jmemsys.h" /* for prototypes */ #endif +#endif /* SHAREJPEG == 0 */ private_st_jpeg_block(); @@ -173,6 +177,8 @@ gs_jpeg_destroy(stream_DCT_state * st) return 0; } +#if SHARE_JPEG == 0 +/* Don't use the non-public insterface if we're linking to a shared lib */ /* * These routines replace the low-level memory manager of the IJG library. * They pass malloc/free calls to the Ghostscript memory manager. @@ -277,3 +283,4 @@ jpeg_mem_term(j_common_ptr cinfo) { /* no work */ } +#endif /* SHAREJPEG == 0 */ -- cgit v1.2.3