Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit e27b340

Browse files
livecodeianlivecodeian
committed
Merge remote-tracking branch 'runrevian/refactor-imageloader' into bugfix-13021
Conflicts: engine/engine.xcodeproj/project.pbxproj engine/src/ifile.cpp engine/src/igif.cpp engine/src/iimport.cpp engine/src/image.h engine/src/image_rep_encoded.cpp
2 parents 691fd84 + 691bc45 commit e27b340

18 files changed

Lines changed: 1531 additions & 540 deletions

‎engine/Android.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ LOCAL_SRC_FILES := $(addprefix src/,\
2121
ijpg.cpp \
2222
image.cpp \
2323
imagelist.cpp \
24+
imageloader.cpp \
2425
image_rep.cpp \
2526
image_rep_encoded.cpp \
2627
image_rep_mutable.cpp \

‎engine/Makefile.kernel‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ SOURCES=\
1313
graphicscontext.cpp \
1414
group.cpp \
1515
handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
16-
igif.cpp iimport.cpp ijpg.cpp image.cpp \
16+
igif.cpp iimport.cpp ijpg.cpp \
17+
image.cpp \
1718
image_rep.cpp \
1819
image_rep_encoded.cpp \
1920
image_rep_mutable.cpp \
2021
image_rep_densitymapped.cpp \
2122
image_rep_resampled.cpp \
22-
imagebitmap.cpp ipng.cpp imagelist.cpp \
23+
imagebitmap.cpp \
24+
imagelist.cpp \
25+
imageloader.cpp \
26+
ipng.cpp \
2327
iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
2428
itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
2529
mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \

‎engine/Makefile.kernel-server‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ SOURCES=\
1111
execpt.cpp express.cpp field.cpp fieldf.cpp fieldh.cpp fields.cpp \
1212
font.cpp funcs.cpp funcsm.cpp globals.cpp graphic.cpp group.cpp \
1313
handler.cpp hc.cpp hndlrlst.cpp ibmp.cpp idraw.cpp ifile.cpp \
14-
igif.cpp iimport.cpp ijpg.cpp image.cpp imagelist.cpp \
14+
igif.cpp iimport.cpp ijpg.cpp \
15+
image.cpp \
1516
image_rep.cpp \
1617
image_rep_encoded.cpp \
1718
image_rep_mutable.cpp \
1819
image_rep_densitymapped.cpp \
1920
image_rep_resampled.cpp \
20-
imagebitmap.cpp ipng.cpp \
21+
imagebitmap.cpp \
22+
imagelist.cpp \
23+
imageloader.cpp \
24+
ipng.cpp \
2125
iquantization.cpp iquantize_new.cpp irle.cpp iutil.cpp \
2226
itransform.cpp keywords.cpp line.cpp literal.cpp magnify.cpp mcerror.cpp \
2327
mcio.cpp mcstring.cpp mctheme.cpp newobj.cpp \

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
E85A91BF16C2B4D300C07FA9 /* stackcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E85A91BE16C2B4D300C07FA9 /* stackcache.cpp */; };
270270
E86481931439BCE100775960 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E86481921439BCE100775960 /* StoreKit.framework */; };
271271
E877A6181850D85F008FDE2C /* resolution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E877A6171850D85F008FDE2C /* resolution.cpp */; };
272+
E89DBC52198A6F410009651B /* imageloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E89DBC50198A6F410009651B /* imageloader.cpp */; };
272273
E8AB9053180E9DCD0050A249 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */; };
273274
E8B6EE1417F0A1C900F77E0E /* stackview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8B6EE1317F0A1C900F77E0E /* stackview.cpp */; };
274275
E8BE6E2A182966BA00D7C604 /* image_rep_resampled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8BE6E29182966BA00D7C604 /* image_rep_resampled.cpp */; };
@@ -934,6 +935,8 @@
934935
E891124A148675C900B554CF /* DialogModule.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = DialogModule.java; sourceTree = "<group>"; };
935936
E89112EB148E73EB00B554CF /* mbldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mbldialog.cpp; path = src/mbldialog.cpp; sourceTree = "<group>"; };
936937
E89A45D314EE7603007250AA /* mblnotification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mblnotification.h; path = src/mblnotification.h; sourceTree = "<group>"; };
938+
E89DBC50198A6F410009651B /* imageloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imageloader.cpp; path = src/imageloader.cpp; sourceTree = "<group>"; };
939+
E89DBC51198A6F410009651B /* imageloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imageloader.h; path = src/imageloader.h; sourceTree = "<group>"; };
937940
E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = image_rep_densitymapped.cpp; path = src/image_rep_densitymapped.cpp; sourceTree = "<group>"; };
938941
E8B4FDD8152CAF8300CBAF90 /* mbliphonefs.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonefs.mm; path = src/mbliphonefs.mm; sourceTree = "<group>"; };
939942
E8B6EE1317F0A1C900F77E0E /* stackview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = stackview.cpp; path = src/stackview.cpp; sourceTree = "<group>"; };
@@ -1524,6 +1527,8 @@
15241527
E8BE6E29182966BA00D7C604 /* image_rep_resampled.cpp */,
15251528
4D8C699B167A22B500D3CCE7 /* imagebitmap.cpp */,
15261529
E865A51E1695BF3E00C4CBC3 /* imagebitmap.h */,
1530+
E89DBC50198A6F410009651B /* imageloader.cpp */,
1531+
E89DBC51198A6F410009651B /* imageloader.h */,
15271532
4DD3DE661040AD2800CAC7EF /* ipng.cpp */,
15281533
4DDD7F28134BA5BF009037A0 /* iquantization.cpp */,
15291534
E865A51F1695BF3E00C4CBC3 /* iquantization.h */,
@@ -2255,6 +2260,7 @@
22552260
4DABCE4D15ECD4B50085E214 /* syscfdate.cpp in Sources */,
22562261
4DABCE4F15ECD4B50085E214 /* sysspec.cpp in Sources */,
22572262
4DABCE5015ECD4B50085E214 /* sysunxnetwork.cpp in Sources */,
2263+
E89DBC52198A6F410009651B /* imageloader.cpp in Sources */,
22582264
4DABCE5115ECD4B50085E214 /* text.cpp in Sources */,
22592265
4DABCE5215ECD4B50085E214 /* tilecache.cpp in Sources */,
22602266
4DABCE5315ECD4B50085E214 /* tilecachecg.cpp in Sources */,

‎engine/engine.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,10 @@
534534
E85130F4180D9969004D1DB4 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E85130F3180D9969004D1DB4 /* image_rep_densitymapped.cpp */; };
535535
E85130F5180D9969004D1DB4 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E85130F3180D9969004D1DB4 /* image_rep_densitymapped.cpp */; };
536536
E87FAFEC1924F25000ED338B /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E87FAFEB1924F24300ED338B /* region.cpp */; };
537+
E8687A941987F5A80093C756 /* imageloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8687A931987F5A80093C756 /* imageloader.cpp */; };
537538
E88869AC180D63FC0026BFDA /* stackview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8988A8917FDD5B700F640F4 /* stackview.cpp */; };
538539
E8988A8A17FDD5B700F640F4 /* stackview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8988A8917FDD5B700F640F4 /* stackview.cpp */; };
540+
E89DBC4F198A6E2D0009651B /* imageloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8687A931987F5A80093C756 /* imageloader.cpp */; };
539541
E8A554B11785A70600DABC1A /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C10D82916BFADB800D25197 /* libgraphics.a */; };
540542
E8A554B21785A70600DABC1A /* libskia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E8AF4895174D5563000B2F9E /* libskia.a */; };
541543
E8A554B51785A7C600DABC1A /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C10D82916BFADB800D25197 /* libgraphics.a */; };
@@ -1546,6 +1548,8 @@
15461548
BE4D6171189A5495002DA467 /* AttachmentProvider.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = AttachmentProvider.java; sourceTree = "<group>"; };
15471549
E82206E0184F810A00117D10 /* resolution.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = resolution.cpp; path = src/resolution.cpp; sourceTree = "<group>"; };
15481550
E85130F3180D9969004D1DB4 /* image_rep_densitymapped.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = image_rep_densitymapped.cpp; path = src/image_rep_densitymapped.cpp; sourceTree = "<group>"; };
1551+
E8687A921987F24A0093C756 /* imageloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imageloader.h; path = src/imageloader.h; sourceTree = "<group>"; };
1552+
E8687A931987F5A80093C756 /* imageloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imageloader.cpp; path = src/imageloader.cpp; sourceTree = "<group>"; };
15491553
E86A04F6142A49EF005ECD82 /* srvsession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srvsession.cpp; path = src/srvsession.cpp; sourceTree = "<group>"; };
15501554
E86A04F7142A49EF005ECD82 /* srvsession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = srvsession.h; path = src/srvsession.h; sourceTree = "<group>"; };
15511555
E86D598F170AEE0000060AED /* deploysecurity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = deploysecurity.h; path = src/deploysecurity.h; sourceTree = "<group>"; };
@@ -2683,6 +2687,8 @@
26832687
E8DDE5DD16C2B1A7007367E4 /* image_rep_resampled.cpp */,
26842688
4D83871C1678B2C9003BEC7C /* imagebitmap.cpp */,
26852689
4D8387261678B2F4003BEC7C /* imagebitmap.h */,
2690+
E8687A921987F24A0093C756 /* imageloader.h */,
2691+
E8687A931987F5A80093C756 /* imageloader.cpp */,
26862692
4D587E580B8096FD00200116 /* ipng.cpp */,
26872693
3C0A3CC310BAF6120074D630 /* iquantization.cpp */,
26882694
3C0A3CC510BAF63B0074D630 /* iquantization.h */,
@@ -3437,6 +3443,7 @@
34373443
4D1F9D1F171C682E0091C6CB /* srvstack.cpp in Sources */,
34383444
4D1F9D20171C682E0091C6CB /* sysspec.cpp in Sources */,
34393445
4D1F9D21171C682E0091C6CB /* aclip.cpp in Sources */,
3446+
E89DBC4F198A6E2D0009651B /* imageloader.cpp in Sources */,
34403447
4D1F9D22171C682E0091C6CB /* answer.cpp in Sources */,
34413448
4D1F9D23171C682E0091C6CB /* ask.cpp in Sources */,
34423449
4D1F9D24171C682E0091C6CB /* bitmapeffect.cpp in Sources */,
@@ -3817,6 +3824,7 @@
38173824
4DB32404174BEE3300046FFE /* sysosxrandom.cpp in Sources */,
38183825
4C10D85416BFB1DC00D25197 /* graphicscontext.cpp in Sources */,
38193826
E8B5BB1416DF77DF00CA02FB /* imagelist.cpp in Sources */,
3827+
E8687A941987F5A80093C756 /* imageloader.cpp in Sources */,
38203828
E8AF465B174CF247000B2F9E /* surface.cpp in Sources */,
38213829
E8AE876C177B3F5C0041B7E0 /* cgimageutil.cpp in Sources */,
38223830
E8988A8A17FDD5B700F640F4 /* stackview.cpp in Sources */,

‎engine/kernel-server.vcproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,14 @@
11631163
RelativePath=".\src\imagelist.h"
11641164
>
11651165
</File>
1166+
<File
1167+
RelativePath=".\src\imageloader.cpp"
1168+
>
1169+
</File>
1170+
<File
1171+
RelativePath=".\src\imageloader.h"
1172+
>
1173+
</File>
11661174
<File
11671175
RelativePath=".\src\ipng.cpp"
11681176
>

‎engine/kernel.vcproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,14 @@
382382
RelativePath=".\src\imagebitmap.h"
383383
>
384384
</File>
385+
<File
386+
RelativePath=".\src\imageloader.cpp"
387+
>
388+
</File>
389+
<File
390+
RelativePath=".\src\imageloader.h"
391+
>
392+
</File>
385393
<File
386394
RelativePath="src\ipng.cpp"
387395
>

0 commit comments

Comments
 (0)