Index: third_party/libjpeg_turbo/jconfig.h |
=================================================================== |
--- third_party/libjpeg_turbo/jconfig.h (revision 95020) |
+++ third_party/libjpeg_turbo/jconfig.h (working copy) |
@@ -1,103 +1,73 @@ |
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
-/* ***** BEGIN LICENSE BLOCK ***** |
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
- * |
- * The contents of this file are subject to the Mozilla Public License Version |
- * 1.1 (the "License"); you may not use this file except in compliance with |
- * the License. You may obtain a copy of the License at |
- * http://www.mozilla.org/MPL/ |
- * |
- * Software distributed under the License is distributed on an "AS IS" basis, |
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
- * for the specific language governing rights and limitations under the |
- * License. |
- * |
- * The Original Code is mozilla.org code. |
- * |
- * The Initial Developer of the Original Code is |
- * Netscape Communications Corporation. |
- * Portions created by the Initial Developer are Copyright (C) 1998 |
- * the Initial Developer. All Rights Reserved. |
- * |
- * Contributor(s): |
- * |
- * Alternatively, the contents of this file may be used under the terms of |
- * either the GNU General Public License Version 2 or later (the "GPL"), or |
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
- * in which case the provisions of the GPL or the LGPL are applicable instead |
- * of those above. If you wish to allow use of your version of this file only |
- * under the terms of either the GPL or the LGPL, and not to allow others to |
- * use your version of this file under the terms of the MPL, indicate your |
- * decision by deleting the provisions above and replace them with the notice |
- * and other provisions required by the GPL or the LGPL. If you do not delete |
- * the provisions above, a recipient may use your version of this file under |
- * the terms of any one of the MPL, the GPL or the LGPL. |
- * |
- * ***** END LICENSE BLOCK ***** */ |
- |
-/* |
- * jconfig.h to configure the IJG JPEG library for the Mozilla/Netscape |
- * environment. Note that there are also Mozilla mods in jmorecfg.h. |
+/* jconfig.h. Generated from jconfig.h.in by configure. */ |
+/* Version ID for the JPEG library. |
+ * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60". |
*/ |
+#ifndef JPEG_LIB_VERSION |
+#define JPEG_LIB_VERSION 62 |
+#endif /* JPEG_LIB_VERSION */ |
-/* We assume an ANSI C or C++ compilation environment */ |
-#define HAVE_PROTOTYPES |
-#define HAVE_UNSIGNED_CHAR |
-#define HAVE_UNSIGNED_SHORT |
-/* #define void char */ |
-/* #define const */ |
+/* Support arithmetic encoding */ |
+#define C_ARITH_CODING_SUPPORTED 1 |
+ |
+/* Support arithmetic decoding */ |
+#define D_ARITH_CODING_SUPPORTED 1 |
+ |
+/* Define if your compiler supports prototypes */ |
+#ifndef HAVE_PROTOTYPES |
+#define HAVE_PROTOTYPES 1 |
+#endif /* HAVE_PROTOTYPES */ |
+ |
+/* Define to 1 if you have the <stddef.h> header file. */ |
#ifndef HAVE_STDDEF_H |
-#define HAVE_STDDEF_H |
+#define HAVE_STDDEF_H 1 |
#endif /* HAVE_STDDEF_H */ |
+ |
+/* Define to 1 if you have the <stdlib.h> header file. */ |
#ifndef HAVE_STDLIB_H |
-#define HAVE_STDLIB_H |
+#define HAVE_STDLIB_H 1 |
#endif /* HAVE_STDLIB_H */ |
-#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 |
-/* With this setting, the IJG code will work regardless of whether |
- * type "char" is signed or unsigned. |
- */ |
-#undef CHAR_IS_UNSIGNED |
+/* Define to 1 if the system has the type `unsigned char'. */ |
+#ifndef HAVE_UNSIGNED_CHAR |
+#define HAVE_UNSIGNED_CHAR 1 |
+#endif /* HAVE_UNSIGNED_CHAR */ |
+/* Define to 1 if the system has the type `unsigned short'. */ |
+#ifndef HAVE_UNSIGNED_SHORT |
+#define HAVE_UNSIGNED_SHORT 1 |
+#endif /* HAVE_UNSIGNED_SHORT */ |
-/* defines that need not be visible to callers of the IJG library */ |
+/* Define if you want use complete types */ |
+/* #undef INCOMPLETE_TYPES_BROKEN */ |
-#ifdef JPEG_INTERNALS |
+/* Define if you have BSD-like bzero and bcopy */ |
+/* #undef NEED_BSD_STRINGS */ |
-/* If right shift of "long" quantities is unsigned on your machine, |
- * you'll have to define this. Fortunately few people should need it. |
- */ |
-#undef RIGHT_SHIFT_IS_UNSIGNED |
+/* Define if you need short function names */ |
+/* #undef NEED_SHORT_EXTERNAL_NAMES */ |
-#ifdef XP_MAC /* Macintosh */ |
+/* Define if you have sys/types.h */ |
+/* #undef NEED_SYS_TYPES_H */ |
-#define ALIGN_TYPE long /* for sane memory alignment */ |
-#define NO_GETENV /* we do have the function, but it's dead */ |
+/* Define if shift is unsigned */ |
+/* #undef RIGHT_SHIFT_IS_UNSIGNED */ |
-#endif /* XP_MAC */ |
+/* Use accelerated SIMD routines. */ |
+#define WITH_SIMD 1 |
-#endif /* JPEG_INTERNALS */ |
+/* Define to 1 if type `char' is unsigned and you are not using gcc. */ |
+#ifndef __CHAR_UNSIGNED__ |
+/* # undef __CHAR_UNSIGNED__ */ |
+#endif |
+/* Define to empty if `const' does not conform to ANSI C. */ |
+/* #undef const */ |
-/* these defines are not interesting for building just the IJG library, |
- * but we leave 'em here anyway. |
- */ |
-#ifdef JPEG_CJPEG_DJPEG |
+/* Define to `__inline__' or `__inline' if that's what the C compiler |
+ calls it, or to nothing if 'inline' is not supported under any name. */ |
+#ifndef __cplusplus |
+/* #undef inline */ |
+#endif |
-#define BMP_SUPPORTED /* BMP image file format */ |
-#define GIF_SUPPORTED /* GIF image file format */ |
-#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */ |
-#undef RLE_SUPPORTED /* Utah RLE image file format */ |
-#define TARGA_SUPPORTED /* Targa image file format */ |
- |
-#undef TWO_FILE_COMMANDLINE |
-#undef NEED_SIGNAL_CATCHER |
-#undef DONT_USE_B_MODE |
-#undef PROGRESS_REPORT |
- |
-#endif /* JPEG_CJPEG_DJPEG */ |
+/* Define to `unsigned int' if <sys/types.h> does not define. */ |
+/* #undef size_t */ |