Author: gschneider
Date: Mon May 2 21:01:14 2011
New Revision: 51561
URL: http://svn.reactos.org/svn/reactos?rev=51561&view=rev
Log:
[libjpeg] Forgotten files from r51559
Modified:
trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h
trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h
trunk/reactos/include/reactos/libs/libjpeg/jversion.h
Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h?rev=51561&r1=51560&r2=51561&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1]
(original)
+++ trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] Mon May
2 21:01:14 2011
@@ -23,10 +23,6 @@
#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
-#if (defined (_MSC_VER) && (_MSC_VER >= 800))
-#define HAVE_UNSIGNED_CHAR
-#define EXTERN(type) extern type __cdecl
-#endif
/*
* Maximum number of components (color channels) allowed in JPEG image.
Modified: trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h?rev=51561&r1=51560&r2=51561&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h [iso-8859-1] Mon May
2 21:01:14 2011
@@ -2,7 +2,7 @@
* jpeglib.h
*
* Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2009 by Guido Vollbeding.
+ * Modified 2002-2010 by Guido Vollbeding.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -33,11 +33,13 @@
#endif
#endif
-/* Version ID for the JPEG library.
+/* Version IDs for the JPEG library.
* Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
*/
-#define JPEG_LIB_VERSION 80 /* Version 8.0 */
+#define JPEG_LIB_VERSION 80 /* Compatibility version 8.0 */
+#define JPEG_LIB_VERSION_MAJOR 8
+#define JPEG_LIB_VERSION_MINOR 3
/* Various constants determining the sizes of things.
Modified: trunk/reactos/include/reactos/libs/libjpeg/jversion.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjpeg/jversion.h?rev=51561&r1=51560&r2=51561&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/libjpeg/jversion.h [iso-8859-1]
(original)
+++ trunk/reactos/include/reactos/libs/libjpeg/jversion.h [iso-8859-1] Mon May
2 21:01:14 2011
@@ -1,7 +1,7 @@
/*
* jversion.h
*
- * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
+ * Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.
* This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -9,6 +9,6 @@
*/
-#define JVERSION "8b 16-May-2010"
+#define JVERSION "8c 16-Jan-2011"
-#define JCOPYRIGHT "Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"
+#define JCOPYRIGHT "Copyright (C) 2011, Thomas G. Lane, Guido Vollbeding"
