diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-14 14:20:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-15 11:47:02 +0000 |
| commit | ae967544463d1683dc4e26492c3646f1dc431576 (patch) | |
| tree | 461da88001b6a174e8f47d688c55bda571a12c6e /external/jpeg/configs | |
| parent | d61efe5806c9b87f026a8bc45a00dcb171881711 (diff) | |
just use turbo-jpeg as sole internal solution
prefer having nasm/yasm but if its not there warn and fallback
to disabling assembler optional goodness
Change-Id: Ib31ad81717842f743c2910d575a9ebbc279a9c79
Reviewed-on: https://gerrit.libreoffice.org/35189
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/jpeg/configs')
| -rw-r--r-- | external/jpeg/configs/jconfig.h | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/external/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h deleted file mode 100644 index bb8aa9edbc7b..000000000000 --- a/external/jpeg/configs/jconfig.h +++ /dev/null @@ -1,66 +0,0 @@ -/* jconfig.h. Generated from jconfig.cfg by configure. */ -/* jconfig.cfg --- source file edited by configure script */ -/* see jconfig.txt for explanations */ - -#define HAVE_PROTOTYPES 1 -#define HAVE_UNSIGNED_CHAR 1 -#define HAVE_UNSIGNED_SHORT 1 -/* #undef void */ -/* #undef const */ -/* #undef CHAR_IS_UNSIGNED */ -#define HAVE_STDDEF_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_LOCALE_H 1 -/* #undef NEED_BSD_STRINGS */ -/* #undef NEED_SYS_TYPES_H */ -/* #undef NEED_FAR_POINTERS */ -/* #undef NEED_SHORT_EXTERNAL_NAMES */ -/* Define this if you get warnings about undefined structures. */ -/* #undef INCOMPLETE_TYPES_BROKEN */ - -/* Define "boolean" as unsigned char, not enum, on Windows systems. */ -#ifdef _WIN32 -#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ -typedef unsigned char boolean; -#endif -#ifndef FALSE /* in case these macros already exist */ -#define FALSE 0 /* values of boolean */ -#endif -#ifndef TRUE -#define TRUE 1 -#endif -#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -#endif - -#ifdef JPEG_INTERNALS - -/* #undef RIGHT_SHIFT_IS_UNSIGNED */ -#ifdef _WIN32 -#define INLINE __inline -#elif defined __sun -#define INLINE -#else -#define INLINE inline -#endif -/* These are for configuring the JPEG memory manager. */ -/* #undef DEFAULT_MAX_MEM */ -/* #undef NO_MKTEMP */ - -#endif /* JPEG_INTERNALS */ - -#ifdef JPEG_CJPEG_DJPEG - -#undef BMP_SUPPORTED /* BMP image file format */ -#undef GIF_SUPPORTED /* GIF image file format */ -#undef PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */ -/* #undef RLE_SUPPORTED */ -#undef TARGA_SUPPORTED /* Targa image file format */ - -/* #undef TWO_FILE_COMMANDLINE */ -/* #undef NEED_SIGNAL_CATCHER */ -/* #undef DONT_USE_B_MODE */ - -/* Define this if you want percent-done progress reports from cjpeg/djpeg. */ -/* #undef PROGRESS_REPORT */ - -#endif /* JPEG_CJPEG_DJPEG */ |