Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Fixing #351 #395

Merged
merged 4 commits into from
Nov 3, 2017
Merged

Fixing #351 #395

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463d916
Fixing #351
GalHorowitz Oct 30, 2017
abf7a1a
Merge pull request #1 from GalHorowitz/GalHorowitz-patch-1
GalHorowitz Oct 30, 2017
68a17e3
Merge branch 'master' into master
StanleyGoldman Nov 1, 2017
2d1aa12
Work around the ABI breakage
shana Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,42 @@ static class StreamExtensions

static StreamExtensions()
{
var t = typeof(Texture2D).Assembly.GetType("UnityEngine.ImageConversion", false, false);
if (t != null)
// 5.6
// looking for Texture2D.LoadImage(byte[] data)
loadImage = typeof(Texture2D).GetMethods().FirstOrDefault(x => x.Name == "LoadImage" && x.GetParameters().Length == 1);
if (loadImage != null)
{
// looking for ImageConversion.LoadImage(this Texture2D tex, byte[] data)
loadImage = t.GetMethods().FirstOrDefault(x => x.Name == "LoadImage" && x.GetParameters().Length == 2);
invokeLoadImage = (tex, ms) =>
{
loadImage.Invoke(null, new object[] { tex, ms.ToArray() });
loadImage.Invoke(tex, new object[] { ms.ToArray() });
return tex;
};
}
else
{
// looking for Texture2D.LoadImage(byte[] data)
loadImage = typeof(Texture2D).GetMethods().FirstOrDefault(x => x.Name == "LoadImage" && x.GetParameters().Length == 1);
invokeLoadImage = (tex, ms) =>
// 2017.1
var t = typeof(Texture2D).Assembly.GetType("UnityEngine.ImageConversion", false, false);
if (t == null)
{
loadImage.Invoke(tex, new object[] { ms.ToArray() });
return tex;
};
// 2017.2 and above
t = Assembly.Load("UnityEngine.ImageConversionModule").GetType("UnityEngine.ImageConversion", false, false);
}

if (t != null)
{
// looking for ImageConversion.LoadImage(this Texture2D tex, byte[] data)
loadImage = t.GetMethods().FirstOrDefault(x => x.Name == "LoadImage" && x.GetParameters().Length == 2);
invokeLoadImage = (tex, ms) =>
{
loadImage.Invoke(null, new object[] { tex, ms.ToArray() });
return tex;
};
}
}

if (loadImage == null)
{
Logging.Error("Could not find ImageConversion.LoadImage method");
}
}

Expand Down