[poppler] Can't compile with --disable-libjpeg (patch inside)

[Daniel Drake]

Hi,

Compiling current cvs with --disable-libjpeg fails:

In file included from ImageOutputDev.cc:25:
../poppler/DCTStream.h:52: error: redefinition of `class DCTStream'
../poppler/Stream.h:569: error: previous definition of `class DCTStream'
make[2]: *** [ImageOutputDev.o] Error 1

The attached diff solves it, by moving the inbuilt DCTStream 
implementation into files alongside the libjpeg ones, which should make 
it easier to manage.

If you'd prefer another approach to this, let me know, and I'll refine 
the patch.

Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: poppler-no-libjpeg.patch
Type: text/x-patch
Size: 78637 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/poppler/attachments/20051229/4c5837fb/poppler-no-libjpeg-0001.bin