57d25b7595
* external/zlib/zlib.dif
* external/jpeg/Makefile
+ external/jpeg/jpeg.dif
+ Added/updated diffs after VxWorks changes.
Patch by Tamas Tevesz. Thanks!
81 lines
2.9 KiB
Plaintext
81 lines
2.9 KiB
Plaintext
diff -urN jpeg.orig/jmorecfg.h jpeg/jmorecfg.h
|
|
--- jpeg.orig/jmorecfg.h 2010-07-15 17:16:26.470234033 +0200
|
|
+++ jpeg/jmorecfg.h 2010-07-15 17:16:26.470234033 +0200
|
|
@@ -138,7 +138,9 @@
|
|
#ifdef CHAR_IS_UNSIGNED
|
|
typedef char UINT8;
|
|
#else /* not CHAR_IS_UNSIGNED */
|
|
+#ifndef __INCvxTypesOldh /* VxWorks defines this */
|
|
typedef short UINT8;
|
|
+#endif
|
|
#endif /* CHAR_IS_UNSIGNED */
|
|
#endif /* HAVE_UNSIGNED_CHAR */
|
|
|
|
@@ -147,7 +149,9 @@
|
|
#ifdef HAVE_UNSIGNED_SHORT
|
|
typedef unsigned short UINT16;
|
|
#else /* not HAVE_UNSIGNED_SHORT */
|
|
+#ifndef __INCvxTypesOldh /* VxWorks defines this */
|
|
typedef unsigned int UINT16;
|
|
+#endif
|
|
#endif /* HAVE_UNSIGNED_SHORT */
|
|
|
|
/* INT16 must hold at least the values -32768..32767. */
|
|
@@ -162,11 +166,13 @@
|
|
#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
|
|
#ifndef _BASETSD_H /* MinGW is slightly different */
|
|
#ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
|
|
+#ifndef __INCvxTypesOldh /* VxWorks defines this */
|
|
typedef long INT32;
|
|
#endif
|
|
#endif
|
|
#endif
|
|
#endif
|
|
+#endif
|
|
|
|
/* Datatype used for image dimensions. The JPEG standard only supports
|
|
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|
|
@@ -190,6 +196,9 @@
|
|
/* a function called through method pointers: */
|
|
#define METHODDEF(type) static type
|
|
/* a function used only in its module: */
|
|
+#ifdef __INCvxTypesOldh /* VxWorks defines this */
|
|
+#undef LOCAL
|
|
+#endif
|
|
#define LOCAL(type) static type
|
|
/* a function referenced thru EXTERNs: */
|
|
#define GLOBAL(type) type
|
|
diff -urN jpeg.orig/README jpeg/README
|
|
--- jpeg.orig/README 2010-07-15 17:16:22.240234269 +0200
|
|
+++ jpeg/README 2010-07-15 17:16:22.240234269 +0200
|
|
@@ -1,7 +1,7 @@
|
|
The Independent JPEG Group's JPEG software
|
|
==========================================
|
|
|
|
-README for release 8b of 16-May-2010
|
|
+README for release 8a of 28-Feb-2010
|
|
====================================
|
|
|
|
This distribution contains the eighth public release of the Independent JPEG
|
|
@@ -254,8 +254,8 @@
|
|
The "official" archive site for this software is www.ijg.org.
|
|
The most recent released version can always be found there in
|
|
directory "files". This particular version will be archived as
|
|
-http://www.ijg.org/files/jpegsrc.v8b.tar.gz, and in Windows-compatible
|
|
-"zip" archive format as http://www.ijg.org/files/jpegsr8b.zip.
|
|
+http://www.ijg.org/files/jpegsrc.v8a.tar.gz, and in Windows-compatible
|
|
+"zip" archive format as http://www.ijg.org/files/jpegsr8a.zip.
|
|
|
|
The JPEG FAQ (Frequently Asked Questions) article is a source of some
|
|
general information about JPEG.
|
|
@@ -285,8 +285,7 @@
|
|
fruitful consultations in Boston, MA and Milan, Italy.
|
|
|
|
Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther
|
|
-Maier-Gerber, Walter Stoeber, and Fred Schmitz for corresponding
|
|
-business development.
|
|
+Maier-Gerber, and Walter Stoeber for corresponding business development.
|
|
|
|
Thank to Nico Zschach and Dirk Stelling of the technical support team
|
|
at the Digital Images company in Halle for providing me with extra
|