diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-03-31 11:40:44 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-03-31 11:40:44 +0000 |
| commit | 4a2af655d2182264bead8d62bb40da4fd7d0ebd8 (patch) | |
| tree | 9672f42eceb844b9a0faade094c3371bed17f88d /Build/source | |
| parent | 47ad49e6a9e33eb922b870b685feba8d23ff9e65 (diff) | |
dvipng - allow for libgd without jpeg support
git-svn-id: svn://tug.org/texlive/trunk@7259 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/dvipng/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/config.h.in | 3 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/configure.ac | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/special.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 3aef515be89..bd7229e7270 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,8 @@ +2008-03-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * special.c: allow for libgd without jpeg support. + * configure.ac, config.h.in, configure: adapt. + 2008-02-20 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use AC_SEARCH_LIBS such that -lm and -lgen are diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in index 81a3bb3024d..b3dde183d3a 100644 --- a/Build/source/texk/dvipng/config.h.in +++ b/Build/source/texk/dvipng/config.h.in @@ -57,6 +57,9 @@ /* Define to 1 if you have the `gdImageGif' function. */ #undef HAVE_GDIMAGEGIF +/* Define to 1 if you have the `gdImageJpeg' function. */ +#undef HAVE_GDIMAGEJPEG + /* Define to 1 if you have the `gdImagePngEx' function. */ #undef HAVE_GDIMAGEPNGEX diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index aacd87ec36e..c9439e40a23 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -170,8 +170,8 @@ sinclude(../../libs/freetype2/withenable.ac) sinclude(../../libs/freetype2/freetype2.ac) sinclude(../kpathsea/withenable.ac) -dnl -- gd jpeg fn not defined? AC_DEFINE(HAVE_GDIMAGECREATETRUECOLOR) -dnl then we get a warning about gdImageAlpha, but so what. +AC_DEFINE(HAVE_GDIMAGEGIF) +AC_DEFINE(HAVE_GDIMAGECREATETRUECOLOR) AC_DEFINE(HAVE_GDIMAGEPNGEX) AC_DEFINE(HAVE_GD_H) AC_DEFINE(HAVE_LIBGD) diff --git a/Build/source/texk/dvipng/special.c b/Build/source/texk/dvipng/special.c index cffcf30f63f..e93e6d5d772 100644 --- a/Build/source/texk/dvipng/special.c +++ b/Build/source/texk/dvipng/special.c @@ -362,7 +362,7 @@ void SetSpecial(char * special, int32_t length, int32_t hh, int32_t vv) break; case 0xff: /* JPEG magic: 0xffd8 */ DEBUG_PRINT(DEBUG_DVI,("\n INCLUDE JPEG \t%s",psfile)); -#ifdef HAVE_GDIMAGECREATETRUECOLOR +#ifdef HAVE_GDIMAGEJPEG fseek(psstream,0,SEEK_SET); psimage=gdImageCreateFromJpeg(psstream); #else |