Skip to content

Commit ad5018e

Browse files
authored
Merge pull request muak#7 from muak/bugfix#6
Bugfix#6
2 parents 3fcedeb + 968b8cb commit ad5018e

File tree

13 files changed

+2788
-2674
lines changed

13 files changed

+2788
-2674
lines changed

ImageEdit/Plugin.ImageEdit.Abstractions/IEditableImage.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,11 @@ public interface IEditableImage:IDisposable
7373
/// </summary>
7474
/// <returns>The ARGB pixels.</returns>
7575
int[] ToArgbPixels();
76+
77+
/// <summary>
78+
/// Get native image. return UIImage on iOS, Bitmap on Android.
79+
/// </summary>
80+
/// <returns>The native image.</returns>
81+
object GetNativeImage();
7682
}
7783
}

ImageEdit/Plugin.ImageEdit.Android/EditableImage.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,9 @@ void UpdateSize()
150150
Height = (int)_image.Height;
151151
}
152152

153+
public object GetNativeImage()
154+
{
155+
return _image;
156+
}
153157
}
154158
}

ImageEdit/Plugin.ImageEdit.iOS/EditableImage.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public IEditableImage ToMonochrome()
188188

189189
public byte[] ToJpeg(float quality = 80)
190190
{
191-
using (var data = _image.AsJPEG(quality)) {
191+
using (var data = _image.AsJPEG(quality / 100f)) {
192192
return data.ToArray();
193193
}
194194
}
@@ -263,5 +263,10 @@ void UpdateSize()
263263
Width = (int)_image.CGImage.Width;
264264
Height = (int)_image.CGImage.Height;
265265
}
266+
267+
public object GetNativeImage()
268+
{
269+
return _image;
270+
}
266271
}
267272
}

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ var g = pixel & 0x0000FF00 >> 8; //Get G
154154
var b = pixel & 0x000000FF; //Get B
155155
```
156156

157+
## GetNativeImage
158+
159+
Get native image on platform.
160+
if platform is iOS, return UIImage; otherwise return Bitmap.
161+
157162
## License
158163

159164
MIT Licensed.

Tests/ImageEditTests/Droid/ImageEditTests.Droid.csproj

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
89
<OutputType>Library</OutputType>
910
<RootNamespace>ImageEditTests.Droid</RootNamespace>
1011
<AssemblyName>ImageEditTests.Droid</AssemblyName>
11-
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
1213
<AndroidApplication>True</AndroidApplication>
1314
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1415
<AndroidResgenClass>Resource</AndroidResgenClass>
@@ -68,21 +69,6 @@
6869
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
6970
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
7071
</Reference>
71-
<Reference Include="FormsViewGroup">
72-
<HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
73-
</Reference>
74-
<Reference Include="Xamarin.Forms.Core">
75-
<HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
76-
</Reference>
77-
<Reference Include="Xamarin.Forms.Platform.Android">
78-
<HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
79-
</Reference>
80-
<Reference Include="Xamarin.Forms.Platform">
81-
<HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
82-
</Reference>
83-
<Reference Include="Xamarin.Forms.Xaml">
84-
<HintPath>..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
85-
</Reference>
8672
<Reference Include="xunit.abstractions">
8773
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
8874
</Reference>
@@ -101,6 +87,21 @@
10187
<Reference Include="xunit.runner.devices">
10288
<HintPath>..\packages\xunit.runner.devices.2.1.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
10389
</Reference>
90+
<Reference Include="FormsViewGroup">
91+
<HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
92+
</Reference>
93+
<Reference Include="Xamarin.Forms.Core">
94+
<HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Xamarin.Forms.Platform.Android">
97+
<HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
98+
</Reference>
99+
<Reference Include="Xamarin.Forms.Platform">
100+
<HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
101+
</Reference>
102+
<Reference Include="Xamarin.Forms.Xaml">
103+
<HintPath>..\..\..\packages\Xamarin.Forms.2.4.0.282\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
104+
</Reference>
104105
</ItemGroup>
105106
<ItemGroup>
106107
<Compile Include="Resources\Resource.designer.cs" />
@@ -144,4 +145,5 @@
144145
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
145146
<Import Project="..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
146147
<Import Project="..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
148+
<Import Project="..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.4.0.282\build\netstandard1.0\Xamarin.Forms.targets')" />
147149
</Project>

0 commit comments

Comments
 (0)