Commit Graph

39 Commits

Author SHA1 Message Date
Vadim Zeitlin
0c4f9b739f Merge tag 'jpeg-9b' into wx
Upgrade submodule sources to the latest upstream release and revert all
our local modifications, except for the addition of jconfig.h, as they
don't seem to be necessary any longer.
2017-11-12 16:22:45 +01:00
Vadim Zeitlin
3b63026d9a Add manually maintained config header used for wxWidgets build
Preserve the behaviour before the submodule switch, even if it is
clearly not ideal and we should use libjpeg configure under Unix.
2017-11-12 00:48:51 +01:00
Julian Smart
27a3c49154 Avoid FAR redefinition
This is partial cherry-pick of e1fdd3f3d9a0a065eb27c8bc176f51a47e43e412
from the main repository.
2017-11-12 00:48:51 +01:00
Vadim Zeitlin
f964314af1 fixed warnings about main used as a variable name
This is partial cherry-pick of efbcd6fb83a9e66f8151957f74a9009daba629e3
from the main repository.
2017-11-12 00:48:51 +01:00
Michael Wetherell
bccd1f6886 Rename boolean to wxjpeg_boolean to avoid conflicts, e.g. with boolean defined in the Windows headers.
This is partial cherry-pick of e604ac7991a2f5bae2ea3ba01662be566e01af8d
from the main repository.
2017-11-12 00:42:17 +01:00
Vadim Zeitlin
13d8529046 renamed main to mymain to suppress the warnings
This is partial cherry-pick of 5f4bffab216491346753a5211c494417708b4802
from the main repository.
2017-11-12 00:39:57 +01:00
Vadim Zeitlin
4b165e3d6e globally renamed INT32 to JPEG_INT32 to solve the [re]definition problems with cygwin/mingw32 headers which sometimes define INT32 and sometimes don't
This is partial cherry-pick of 39c2d6bde187994f45933a2ffa13435a31d12c02
from the main repository.
2017-11-12 00:37:54 +01:00
Julian Smart
2c2231158e Changed test for INT32 to work with latest Cygwin. But might break other versions :-(
This is partial cherry-pick of c72e7103e4161c7e49979dc90674756d022926d9
from the main repository.
2017-11-12 00:37:30 +01:00
Julian Smart
7b30ea72b0 Fixes for GNUPro 00r1
This is partial cherry-pick of 7fc0bd1c0541a819d51354a4a86f126dbb8ad08f
from the main repository.
2017-11-12 00:36:55 +01:00
Václav Slavík
8b45af2f07 moved HAVE_BOOLEAN logic specific to wxWindows outside libjpeg headers
This is partial cherry-pick of f725b2a4ec82141417f60992aa24bda817a5dcee
from the main repository.
2017-11-12 00:36:35 +01:00
Vadim Zeitlin
8c3866ec70 applied patch 473558: fixes for CW compilation under MSW
This is partial cherry-pick of de85a884d77ad5a29b418b343d4d3cc99c127b5e
from the main repository.
2017-11-12 00:36:11 +01:00
Vadim Zeitlin
10655ce3e5 more fixes for mingw32 compilation
This is partial cherry-pick of ce20b5d72190e3f2544891b325dcf66ff1946386
from the main repository.
2017-11-12 00:34:37 +01:00
Vadim Zeitlin
9d15c72a60 mingw32 compilation fix
This is partial cherry-pick of 068cfb66c2b70171633956f36e5957d8981fc36d
from the main repository.
2017-11-12 00:33:59 +01:00
Vadim Zeitlin
573e6c9041 applied patch 411059 (mingw win32 api version check)
This is partial cherry-pick of d8c72298ec07a4f296ffde211360682447b9d159
from the main repository.
2017-11-12 00:33:16 +01:00
Vadim Zeitlin
2f647e587d Another MinGW compilation fix
This is partial cherry-pick of e1fdd3f3d9a0a065eb27c8bc176f51a47e43e412
from the main repository.
2017-11-12 00:32:12 +01:00
Vadim Zeitlin
8886d0baf8 Another tentative MinGW/Cygwin compilation fix
This is partial cherry-pick of ae128b358e6f3b9af9c0630cc455d2e659e13ec8
from the main repository.
2017-11-12 00:27:55 +01:00
Ricky Gonzales
950f173e3c Compilation fix for BC++ 5.5
This is partial cherry-pick of a6e2b3a8316c430a68f91b3c894e856987dd972e
from the main repository.
2017-11-12 00:27:44 +01:00
Julian Smart
454f8209bf Apply INT32-related compilation fix
This is partial cherry-pick of ea64e17a224208f0cbffcb214399711d3678b867
from the main repository.
2017-11-12 00:21:44 +01:00
Guido Vollbeding
a560e4b423 The Independent JPEG Group's JPEG software v9b 2016-02-16 12:27:41 -06:00
Guido Vollbeding
fc11193e7a The Independent JPEG Group's JPEG software v9a 2016-02-16 12:26:00 -06:00
Guido Vollbeding
e7f88aec23 The Independent JPEG Group's JPEG software v9 2016-02-16 12:22:55 -06:00
Guido Vollbeding
5829cb2398 The Independent JPEG Group's JPEG software v8d 2015-07-27 13:50:34 -05:00
Guido Vollbeding
c39ec149e8 The Independent JPEG Group's JPEG software v8c 2015-07-27 13:49:31 -05:00
Guido Vollbeding
a4ecaacde6 The Independent JPEG Group's JPEG software v8b 2015-07-27 13:48:40 -05:00
Guido Vollbeding
f18f81b7e2 The Independent JPEG Group's JPEG software v8a 2015-07-27 13:46:36 -05:00
Guido Vollbeding
989630f70c The Independent JPEG Group's JPEG software v8 2015-07-27 13:45:31 -05:00
Guido Vollbeding
5996a25e2f The Independent JPEG Group's JPEG software v7 2015-07-27 13:44:25 -05:00
Guido Vollbeding
1e247ac854 The Independent JPEG Group's JPEG software v6b with arithmetic coding support 2015-07-27 14:40:46 -05:00
Thomas G. Lane
5ead57a34a The Independent JPEG Group's JPEG software v6b 2015-07-27 13:43:00 -05:00
Thomas G. Lane
489583f516 The Independent JPEG Group's JPEG software v6a 2015-07-29 15:32:35 -05:00
Thomas G. Lane
bc79e0680a The Independent JPEG Group's JPEG software v6 2015-07-29 15:31:30 -05:00
Thomas G. Lane
a8b67c4fbb The Independent JPEG Group's JPEG software v5b 2015-07-29 15:30:19 -05:00
Thomas G. Lane
9ba2f5ed36 The Independent JPEG Group's JPEG software v5a 2015-07-29 15:29:17 -05:00
Thomas G. Lane
36a4ccccd3 The Independent JPEG Group's JPEG software v5 2015-07-29 15:28:00 -05:00
Thomas G. Lane
cc7150e281 The Independent JPEG Group's JPEG software v4a 2015-07-29 15:25:01 -05:00
Thomas G. Lane
88aeed428f The Independent JPEG Group's JPEG software v4 2015-07-29 15:23:45 -05:00
Thomas G. Lane
4a6b730364 The Independent JPEG Group's JPEG software v3 2015-07-29 15:21:19 -05:00
Thomas G. Lane
bd543f030e The Independent JPEG Group's JPEG software v2 2015-07-29 15:20:00 -05:00
Thomas G. Lane
2cbeb8abd9 The Independent JPEG Group's JPEG software v1 2015-07-29 15:18:11 -05:00