Skip to content

Commit 85ea54f

Browse files
HaydnTriggHaydnTrigg
committed
libjpeg
1 parent 0b8cc20 commit 85ea54f

6 files changed

Lines changed: 147 additions & 87 deletions

File tree

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/zlib"]
22
path = src/zlib
33
url = https://github.com/ChimpsAtSea/zlib.git
4+
[submodule "src/libjpeg/libjpeg"]
5+
path = src/libjpeg/libjpeg
6+
url = https://github.com/ChimpsAtSea/libjpeg.git

‎config/tag_debug_untracked_jul_11_2011/config.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@
4040
"/DzError=blam_zError",
4141
"/DDEF_MEM_LEVEL=8"
4242
]
43+
},
44+
"havok": {
45+
"base": "base",
46+
"flags": [
47+
]
48+
},
49+
"jpeg": {
50+
"base": "base",
51+
"flags": [
52+
"/Isrc\\libjpeg"
53+
]
4354
}
4455
}
4556
}

‎config/tag_debug_untracked_jul_11_2011/objects.json‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2214,51 +2214,51 @@
22142214
"libjpeg": {
22152215
"progress_category": "lib",
22162216
"xdk_path": "XDK/9328",
2217-
"cflags": "base",
2217+
"cflags": "jpeg",
22182218
"objects": {
2219-
"libjpeg/jaricom.cpp": "NonMatching",
2220-
"libjpeg/jcapimin.cpp": "NonMatching",
2221-
"libjpeg/jcapistd.cpp": "NonMatching",
2222-
"libjpeg/jcarith.cpp": "NonMatching",
2223-
"libjpeg/jccoefct.cpp": "NonMatching",
2224-
"libjpeg/jccolor.cpp": "NonMatching",
2225-
"libjpeg/jcdctmgr.cpp": "NonMatching",
2226-
"libjpeg/jchuff.cpp": "NonMatching",
2227-
"libjpeg/jcinit.cpp": "NonMatching",
2228-
"libjpeg/jcmainct.cpp": "NonMatching",
2229-
"libjpeg/jcmarker.cpp": "NonMatching",
2230-
"libjpeg/jcmaster.cpp": "NonMatching",
2231-
"libjpeg/jcomapi.cpp": "NonMatching",
2232-
"libjpeg/jcparam.cpp": "NonMatching",
2233-
"libjpeg/jcprepct.cpp": "NonMatching",
2234-
"libjpeg/jcsample.cpp": "NonMatching",
2235-
"libjpeg/jdapimin.cpp": "NonMatching",
2236-
"libjpeg/jdapistd.cpp": "NonMatching",
2237-
"libjpeg/jdarith.cpp": "NonMatching",
2238-
"libjpeg/jdatadst.cpp": "NonMatching",
2239-
"libjpeg/jdatasrc.cpp": "NonMatching",
2240-
"libjpeg/jdcoefct.cpp": "NonMatching",
2241-
"libjpeg/jdcolor.cpp": "NonMatching",
2242-
"libjpeg/jddctmgr.cpp": "NonMatching",
2243-
"libjpeg/jdhuff.cpp": "NonMatching",
2244-
"libjpeg/jdinput.cpp": "NonMatching",
2245-
"libjpeg/jdmainct.cpp": "NonMatching",
2246-
"libjpeg/jdmarker.cpp": "NonMatching",
2247-
"libjpeg/jdmaster.cpp": "NonMatching",
2248-
"libjpeg/jdmerge.cpp": "NonMatching",
2249-
"libjpeg/jdpostct.cpp": "NonMatching",
2250-
"libjpeg/jdsample.cpp": "NonMatching",
2251-
"libjpeg/jerror.cpp": "NonMatching",
2252-
"libjpeg/jfdctflt.cpp": "NonMatching",
2253-
"libjpeg/jfdctfst.cpp": "NonMatching",
2254-
"libjpeg/jfdctint.cpp": "NonMatching",
2255-
"libjpeg/jidctflt.cpp": "NonMatching",
2256-
"libjpeg/jidctfst.cpp": "NonMatching",
2257-
"libjpeg/jidctint.cpp": "NonMatching",
2258-
"libjpeg/jmemmgr.cpp": "NonMatching",
2259-
"libjpeg/jquant1.cpp": "NonMatching",
2260-
"libjpeg/jquant2.cpp": "NonMatching",
2261-
"libjpeg/jutils.cpp": "NonMatching"
2219+
"libjpeg/libjpeg/jaricom.c": "NonMatching",
2220+
"libjpeg/libjpeg/jcapimin.c": "NonMatching",
2221+
"libjpeg/libjpeg/jcapistd.c": "NonMatching",
2222+
"libjpeg/libjpeg/jcarith.c": "NonMatching",
2223+
"libjpeg/libjpeg/jccoefct.c": "NonMatching",
2224+
"libjpeg/libjpeg/jccolor.c": "NonMatching",
2225+
"libjpeg/libjpeg/jcdctmgr.c": "NonMatching",
2226+
"libjpeg/libjpeg/jchuff.c": "NonMatching",
2227+
"libjpeg/libjpeg/jcinit.c": "NonMatching",
2228+
"libjpeg/libjpeg/jcmainct.c": "NonMatching",
2229+
"libjpeg/libjpeg/jcmarker.c": "NonMatching",
2230+
"libjpeg/libjpeg/jcmaster.c": "NonMatching",
2231+
"libjpeg/libjpeg/jcomapi.c": "NonMatching",
2232+
"libjpeg/libjpeg/jcparam.c": "NonMatching",
2233+
"libjpeg/libjpeg/jcprepct.c": "NonMatching",
2234+
"libjpeg/libjpeg/jcsample.c": "NonMatching",
2235+
"libjpeg/libjpeg/jdapimin.c": "NonMatching",
2236+
"libjpeg/libjpeg/jdapistd.c": "NonMatching",
2237+
"libjpeg/libjpeg/jdarith.c": "NonMatching",
2238+
"libjpeg/libjpeg/jdatadst.c": "NonMatching",
2239+
"libjpeg/libjpeg/jdatasrc.c": "NonMatching",
2240+
"libjpeg/libjpeg/jdcoefct.c": "NonMatching",
2241+
"libjpeg/libjpeg/jdcolor.c": "NonMatching",
2242+
"libjpeg/libjpeg/jddctmgr.c": "NonMatching",
2243+
"libjpeg/libjpeg/jdhuff.c": "NonMatching",
2244+
"libjpeg/libjpeg/jdinput.c": "NonMatching",
2245+
"libjpeg/libjpeg/jdmainct.c": "NonMatching",
2246+
"libjpeg/libjpeg/jdmarker.c": "NonMatching",
2247+
"libjpeg/libjpeg/jdmaster.c": "NonMatching",
2248+
"libjpeg/libjpeg/jdmerge.c": "NonMatching",
2249+
"libjpeg/libjpeg/jdpostct.c": "NonMatching",
2250+
"libjpeg/libjpeg/jdsample.c": "NonMatching",
2251+
"libjpeg/libjpeg/jerror.c": "NonMatching",
2252+
"libjpeg/libjpeg/jfdctflt.c": "NonMatching",
2253+
"libjpeg/libjpeg/jfdctfst.c": "NonMatching",
2254+
"libjpeg/libjpeg/jfdctint.c": "NonMatching",
2255+
"libjpeg/libjpeg/jidctflt.c": "NonMatching",
2256+
"libjpeg/libjpeg/jidctfst.c": "NonMatching",
2257+
"libjpeg/libjpeg/jidctint.c": "NonMatching",
2258+
"libjpeg/libjpeg/jmemmgr.c": "NonMatching",
2259+
"libjpeg/libjpeg/jquant1.c": "NonMatching",
2260+
"libjpeg/libjpeg/jquant2.c": "NonMatching",
2261+
"libjpeg/libjpeg/jutils.c": "NonMatching"
22622262
}
22632263
},
22642264
"Rockall": {

‎config/tag_debug_untracked_jul_11_2011/splits.txt‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23233,20 +23233,20 @@ xonlined/profile.cpp:
2323323233
.pdata start:0x8260CEB8 end:0x8260CED0
2323423234
.text start:0x84CB4A40 end:0x84CB4C78
2323523235

23236-
libjpeg/jerror.cpp:
23236+
libjpeg/libjpeg/jerror.c:
2323723237
.rdata start:0x8251412C end:0x82514460
2323823238
.pdata start:0x8260D068 end:0x8260D088
2323923239
.text start:0x84CB9F88 end:0x84CBA3B8
2324023240

23241-
libjpeg/jutils.cpp:
23241+
libjpeg/libjpeg/jutils.c:
2324223242
.rdata start:0x82514460 end:0x825148B0
2324323243
.pdata start:0x8260D1F8 end:0x8260D210
2324423244
.text start:0x84CC1508 end:0x84CC16D8
2324523245

23246-
libjpeg/jaricom.cpp:
23246+
libjpeg/libjpeg/jaricom.c:
2324723247
.rdata start:0x825148B0 end:0x82514A74
2324823248

23249-
libjpeg/jidctflt.cpp:
23249+
libjpeg/libjpeg/jidctflt.c:
2325023250
.rdata start:0x82514A74 end:0x82514B38
2325123251
.text start:0x84CD1D70 end:0x84CD2688
2325223252

@@ -25514,156 +25514,156 @@ hkpcollide/hkAabbTreeRaycastUtil.cpp:
2551425514
.pdata start:0x8260CB70 end:0x8260CDE0
2551525515
.text start:0x84CAAF18 end:0x84CB0920
2551625516

25517-
libjpeg/jdapimin.cpp:
25517+
libjpeg/libjpeg/jdapimin.c:
2551825518
.pdata start:0x8260CED0 end:0x8260CF18
2551925519
.text start:0x84CB4C78 end:0x84CB57E8
2552025520

25521-
libjpeg/jdmaster.cpp:
25521+
libjpeg/libjpeg/jdmaster.c:
2552225522
.pdata start:0x8260CF18 end:0x8260CF50
2552325523
.text start:0x84CB57E8 end:0x84CB6F38
2552425524

25525-
libjpeg/jcapimin.cpp:
25525+
libjpeg/libjpeg/jcapimin.c:
2552625526
.pdata start:0x8260CF50 end:0x8260CF90
2552725527
.text start:0x84CB6F38 end:0x84CB77D8
2552825528

25529-
libjpeg/jdatadst.cpp:
25529+
libjpeg/libjpeg/jdatadst.c:
2553025530
.pdata start:0x8260CF90 end:0x8260CFB0
2553125531
.text start:0x84CB77D8 end:0x84CB7A68
2553225532

25533-
libjpeg/jcapistd.cpp:
25533+
libjpeg/libjpeg/jcapistd.c:
2553425534
.pdata start:0x8260CFB0 end:0x8260CFC8
2553525535
.text start:0x84CB7A68 end:0x84CB7EF0
2553625536

25537-
libjpeg/jdatasrc.cpp:
25537+
libjpeg/libjpeg/jdatasrc.c:
2553825538
.pdata start:0x8260CFC8 end:0x8260CFE0
2553925539
.text start:0x84CB7EF0 end:0x84CB81D8
2554025540

25541-
libjpeg/jdapistd.cpp:
25541+
libjpeg/libjpeg/jdapistd.c:
2554225542
.pdata start:0x8260CFE0 end:0x8260D010
2554325543
.text start:0x84CB81D8 end:0x84CB8A68
2554425544

25545-
libjpeg/jcparam.cpp:
25545+
libjpeg/libjpeg/jcparam.c:
2554625546
.pdata start:0x8260D010 end:0x8260D068
2554725547
.text start:0x84CB8A68 end:0x84CB9F88
2554825548

25549-
libjpeg/jcomapi.cpp:
25549+
libjpeg/libjpeg/jcomapi.c:
2555025550
.pdata start:0x8260D088 end:0x8260D0A8
2555125551
.text start:0x84CBA3B8 end:0x84CBA578
2555225552

25553-
libjpeg/jdinput.cpp:
25553+
libjpeg/libjpeg/jdinput.c:
2555425554
.pdata start:0x8260D0A8 end:0x8260D0E0
2555525555
.text start:0x84CBA578 end:0x84CBB1C8
2555625556

25557-
libjpeg/jdmarker.cpp:
25557+
libjpeg/libjpeg/jdmarker.c:
2555825558
.pdata start:0x8260D0E0 end:0x8260D180
2555925559
.text start:0x84CBB1C8 end:0x84CBF6F8
2556025560

25561-
libjpeg/jmemmgr.cpp:
25561+
libjpeg/libjpeg/jmemmgr.c:
2556225562
.pdata start:0x8260D180 end:0x8260D1F8
2556325563
.text start:0x84CBF6F8 end:0x84CC1508
2556425564

25565-
libjpeg/jdmainct.cpp:
25565+
libjpeg/libjpeg/jdmainct.c:
2556625566
.pdata start:0x8260D210 end:0x8260D240
2556725567
.text start:0x84CC16D8 end:0x84CC2528
2556825568

25569-
libjpeg/jdcoefct.cpp:
25569+
libjpeg/libjpeg/jdcoefct.c:
2557025570
.pdata start:0x8260D240 end:0x8260D280
2557125571
.text start:0x84CC2528 end:0x84CC4100
2557225572

25573-
libjpeg/jdhuff.cpp:
25573+
libjpeg/libjpeg/jdhuff.c:
2557425574
.pdata start:0x8260D280 end:0x8260D2D8
2557525575
.text start:0x84CC4100 end:0x84CC71E8
2557625576

25577-
libjpeg/jdarith.cpp:
25577+
libjpeg/libjpeg/jdarith.c:
2557825578
.pdata start:0x8260D2D8 end:0x8260D328
2557925579
.text start:0x84CC71E8 end:0x84CC9218
2558025580

25581-
libjpeg/jddctmgr.cpp:
25581+
libjpeg/libjpeg/jddctmgr.c:
2558225582
.pdata start:0x8260D328 end:0x8260D338
2558325583
.text start:0x84CC9218 end:0x84CC9C30
2558425584

25585-
libjpeg/jdpostct.cpp:
25585+
libjpeg/libjpeg/jdpostct.c:
2558625586
.pdata start:0x8260D338 end:0x8260D360
2558725587
.text start:0x84CC9C30 end:0x84CCA3A0
2558825588

25589-
libjpeg/jdsample.cpp:
25589+
libjpeg/libjpeg/jdsample.c:
2559025590
.pdata start:0x8260D360 end:0x8260D380
2559125591
.text start:0x84CCA3A0 end:0x84CCAE28
2559225592

25593-
libjpeg/jdcolor.cpp:
25593+
libjpeg/libjpeg/jdcolor.c:
2559425594
.pdata start:0x8260D380 end:0x8260D398
2559525595
.text start:0x84CCAE28 end:0x84CCBAA8
2559625596

25597-
libjpeg/jdmerge.cpp:
25597+
libjpeg/libjpeg/jdmerge.c:
2559825598
.pdata start:0x8260D398 end:0x8260D3B8
2559925599
.text start:0x84CCBAA8 end:0x84CCC810
2560025600

25601-
libjpeg/jquant2.cpp:
25601+
libjpeg/libjpeg/jquant2.c:
2560225602
.pdata start:0x8260D3B8 end:0x8260D408
2560325603
.text start:0x84CCC810 end:0x84CCF0E0
2560425604

25605-
libjpeg/jquant1.cpp:
25605+
libjpeg/libjpeg/jquant1.c:
2560625606
.pdata start:0x8260D408 end:0x8260D460
2560725607
.text start:0x84CCF0E0 end:0x84CD09E8
2560825608

25609-
libjpeg/jcmarker.cpp:
25609+
libjpeg/libjpeg/jcmarker.c:
2561025610
.pdata start:0x8260D460 end:0x8260D4F8
2561125611
.text start:0x84CD09E8 end:0x84CD1C68
2561225612

25613-
libjpeg/jcinit.cpp:
25613+
libjpeg/libjpeg/jcinit.c:
2561425614
.pdata start:0x8260D4F8 end:0x8260D500
2561525615
.text start:0x84CD1C68 end:0x84CD1D70
2561625616

25617-
libjpeg/jidctfst.cpp:
25617+
libjpeg/libjpeg/jidctfst.c:
2561825618
.text start:0x84CD2688 end:0x84CD2F40
2561925619

25620-
libjpeg/jidctint.cpp:
25620+
libjpeg/libjpeg/jidctint.c:
2562125621
.pdata start:0x8260D500 end:0x8260D510
2562225622
.text start:0x84CD2F40 end:0x84CDFFF8
2562325623

25624-
libjpeg/jcmainct.cpp:
25624+
libjpeg/libjpeg/jcmainct.c:
2562525625
.pdata start:0x8260D510 end:0x8260D528
2562625626
.text start:0x84CDFFF8 end:0x84CE0388
2562725627

25628-
libjpeg/jccoefct.cpp:
25628+
libjpeg/libjpeg/jccoefct.c:
2562925629
.pdata start:0x8260D528 end:0x8260D550
2563025630
.text start:0x84CE0388 end:0x84CE1258
2563125631

25632-
libjpeg/jchuff.cpp:
25632+
libjpeg/libjpeg/jchuff.c:
2563325633
.pdata start:0x8260D550 end:0x8260D618
2563425634
.text start:0x84CE1258 end:0x84CE4908
2563525635

25636-
libjpeg/jcarith.cpp:
25636+
libjpeg/libjpeg/jcarith.c:
2563725637
.pdata start:0x8260D618 end:0x8260D670
2563825638
.text start:0x84CE4908 end:0x84CE6E10
2563925639

25640-
libjpeg/jcdctmgr.cpp:
25640+
libjpeg/libjpeg/jcdctmgr.c:
2564125641
.pdata start:0x8260D670 end:0x8260D690
2564225642
.text start:0x84CE6E10 end:0x84CE7F48
2564325643

25644-
libjpeg/jcprepct.cpp:
25644+
libjpeg/libjpeg/jcprepct.c:
2564525645
.pdata start:0x8260D690 end:0x8260D6C0
2564625646
.text start:0x84CE7F48 end:0x84CE8AE0
2564725647

25648-
libjpeg/jcsample.cpp:
25648+
libjpeg/libjpeg/jcsample.c:
2564925649
.pdata start:0x8260D6C0 end:0x8260D700
2565025650
.text start:0x84CE8AE0 end:0x84CE9F40
2565125651

25652-
libjpeg/jccolor.cpp:
25652+
libjpeg/libjpeg/jccolor.c:
2565325653
.pdata start:0x8260D700 end:0x8260D710
2565425654
.text start:0x84CE9F40 end:0x84CEAE38
2565525655

25656-
libjpeg/jcmaster.cpp:
25656+
libjpeg/libjpeg/jcmaster.c:
2565725657
.pdata start:0x8260D710 end:0x8260D758
2565825658
.text start:0x84CEAE38 end:0x84CED018
2565925659

25660-
libjpeg/jfdctflt.cpp:
25660+
libjpeg/libjpeg/jfdctflt.c:
2566125661
.text start:0x84CED018 end:0x84CED650
2566225662

25663-
libjpeg/jfdctfst.cpp:
25663+
libjpeg/libjpeg/jfdctfst.c:
2566425664
.text start:0x84CED650 end:0x84CEDBB8
2566525665

25666-
libjpeg/jfdctint.cpp:
25666+
libjpeg/libjpeg/jfdctint.c:
2566725667
.pdata start:0x8260D758 end:0x8260D800
2566825668
.text start:0x84CEDBB8 end:0x84CF8828
2566925669

‎src/libjpeg/jconfig.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
2+
/* see jconfig.txt for explanations */
3+
4+
#define HAVE_PROTOTYPES
5+
#define HAVE_UNSIGNED_CHAR
6+
#define HAVE_UNSIGNED_SHORT
7+
/* #define void char */
8+
/* #define const */
9+
#undef CHAR_IS_UNSIGNED
10+
#define HAVE_STDDEF_H
11+
#define HAVE_STDLIB_H
12+
#undef NEED_BSD_STRINGS
13+
#undef NEED_SYS_TYPES_H
14+
#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
15+
#undef NEED_SHORT_EXTERNAL_NAMES
16+
#undef INCOMPLETE_TYPES_BROKEN
17+
18+
/* Define "boolean" as unsigned char, not int, per Windows custom */
19+
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
20+
typedef unsigned char boolean;
21+
#endif
22+
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
23+
24+
25+
#ifdef JPEG_INTERNALS
26+
27+
#undef RIGHT_SHIFT_IS_UNSIGNED
28+
29+
#endif /* JPEG_INTERNALS */
30+
31+
#ifdef JPEG_CJPEG_DJPEG
32+
33+
#define BMP_SUPPORTED /* BMP image file format */
34+
#define GIF_SUPPORTED /* GIF image file format */
35+
#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
36+
#undef RLE_SUPPORTED /* Utah RLE image file format */
37+
#define TARGA_SUPPORTED /* Targa image file format */
38+
39+
#define TWO_FILE_COMMANDLINE /* optional */
40+
#define USE_SETMODE /* Microsoft has setmode() */
41+
#undef NEED_SIGNAL_CATCHER
42+
#undef DONT_USE_B_MODE
43+
#undef PROGRESS_REPORT /* optional */
44+
45+
#endif /* JPEG_CJPEG_DJPEG */

‎src/libjpeg/libjpeg‎

Submodule libjpeg added at 1033744

0 commit comments

Comments
 (0)