first iteration :)

KSemenenko · Jun 21, 2016 · fab0d5e · fab0d5e
1 parent 745b3a8
commit fab0d5e
Show file tree

Hide file tree

Showing 15 changed files with 276 additions and 376 deletions.
diff --git a/ColorThief.Android/ColorThief.Android.csproj b/ColorThief.Android/ColorThief.Android.csproj
@@ -41,8 +41,6 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\ColorThieft.Shared\SharedAssemblyInfo.cs">
@@ -51,7 +49,7 @@
     <Compile Include="ColorThief.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="..\ColorThieft.Shared\ColorThieft.Shared.projitems" Label="Shared" />
+  <Import Project="..\ColorThieft.Shared\ColorThieftShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/ColorThief.Android/ColorThief.cs b/ColorThief.Android/ColorThief.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Android.Graphics;
 
 namespace ColorThief
 {
@@ -74,15 +75,19 @@ private CMap GetColorMap(Bitmap sourceImage, int colorCount, int quality = Defau
 
         private IEnumerable<int> GetIntFromPixel(Bitmap bmp)
         {
-            for(var x = 0; x < bmp.Width; x++)
+            for (var x = 0; x < bmp.Width; x++)
             {
-                for(var y = 0; y < bmp.Height; y++)
+                for (var y = 0; y < bmp.Height; y++)
                 {
-                    var clr = bmp.GetPixel(x, y);
-                    yield return clr.B;
-                    yield return clr.G;
-                    yield return clr.R;
-                    yield return clr.A;
+                    var clr = BitConverter.GetBytes(bmp.GetPixel(x, y));
+
+                    if (!BitConverter.IsLittleEndian)
+                        Array.Reverse(clr);
+
+                    yield return (int)clr[3]; //B;
+                    yield return (int)clr[2]; //G;
+                    yield return (int)clr[1]; //R;
+                    yield return (int)clr[0]; //A;
                 }
             }
         }
@@ -96,7 +101,7 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
             const int colorDepth = 4;
 
             var expectedDataLength = pixelCount * colorDepth;
-            if(expectedDataLength != pixels.Length)
+            if (expectedDataLength != pixels.Length)
             {
                 throw new ArgumentException("(expectedDataLength = "
                                             + expectedDataLength + ") != (pixels.length = "
@@ -114,7 +119,7 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
             var numUsedPixels = 0;
             var pixelArray = new int[numRegardedPixels][];
 
-            for(var i = 0; i < pixelCount; i += quality)
+            for (var i = 0; i < pixelCount; i += quality)
             {
                 var offset = i * 4;
                 var b = pixels[offset];
@@ -123,9 +128,9 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
                 var a = pixels[offset + 3];
 
                 // If pixel is mostly opaque and not white
-                if(a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
+                if (a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
                 {
-                    pixelArray[numUsedPixels] = new[] {r, g, b};
+                    pixelArray[numUsedPixels] = new[] { r, g, b };
                     numUsedPixels++;
                 }
             }

diff --git a/ColorThief.Desktop.v45/ColorThief.Desktop.v45.csproj b/ColorThief.Desktop.v45/ColorThief.Desktop.v45.csproj
@@ -33,14 +33,11 @@
     <DocumentationFile>bin\Release\ColorThief.Desktop.v45.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\ColorThieft.Shared\SharedAssemblyInfo.cs">
@@ -49,6 +46,7 @@
     <Compile Include="ColorThief.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <Import Project="..\ColorThieft.Shared\ColorThieftShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/ColorThief.Desktop.v45/ColorThief.cs b/ColorThief.Desktop.v45/ColorThief.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 
 namespace ColorThief
@@ -74,9 +75,9 @@ private CMap GetColorMap(Bitmap sourceImage, int colorCount, int quality = Defau
 
         private IEnumerable<int> GetIntFromPixel(Bitmap bmp)
         {
-            for(var x = 0; x < bmp.Width; x++)
+            for (var x = 0; x < bmp.Width; x++)
             {
-                for(var y = 0; y < bmp.Height; y++)
+                for (var y = 0; y < bmp.Height; y++)
                 {
                     var clr = bmp.GetPixel(x, y);
                     yield return clr.B;
@@ -96,7 +97,7 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
             const int colorDepth = 4;
 
             var expectedDataLength = pixelCount * colorDepth;
-            if(expectedDataLength != pixels.Length)
+            if (expectedDataLength != pixels.Length)
             {
                 throw new ArgumentException("(expectedDataLength = "
                                             + expectedDataLength + ") != (pixels.length = "
@@ -114,7 +115,7 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
             var numUsedPixels = 0;
             var pixelArray = new int[numRegardedPixels][];
 
-            for(var i = 0; i < pixelCount; i += quality)
+            for (var i = 0; i < pixelCount; i += quality)
             {
                 var offset = i * 4;
                 var b = pixels[offset];
@@ -123,9 +124,9 @@ private int[][] GetPixelsFast(Bitmap sourceImage, int quality, bool ignoreWhite)
                 var a = pixels[offset + 3];
 
                 // If pixel is mostly opaque and not white
-                if(a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
+                if (a >= 125 && !(ignoreWhite && r > 250 && g > 250 && b > 250))
                 {
-                    pixelArray[numUsedPixels] = new[] {r, g, b};
+                    pixelArray[numUsedPixels] = new[] { r, g, b };
                     numUsedPixels++;
                 }
             }

diff --git a/ColorThief.Desktop.v46/ColorThief.Desktop.v46.csproj b/ColorThief.Desktop.v46/ColorThief.Desktop.v46.csproj
@@ -32,22 +32,22 @@
     <DocumentationFile>bin\Release\ColorThief.Desktop.v46.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\ColorThief.Desktop.v45\ColorThief.cs">
+      <Link>ColorThief.cs</Link>
+    </Compile>
     <Compile Include="..\ColorThieft.Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ColorThief.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <Import Project="..\ColorThieft.Shared\ColorThieftShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/ColorThief.Desktop.v46/ColorThief.cs b/ColorThief.Desktop.v46/ColorThief.cs
diff --git a/ColorThief.Portable/ColorThief.Portable.csproj b/ColorThief.Portable/ColorThief.Portable.csproj
@@ -39,6 +39,6 @@
     <Compile Include="ColorThief.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="..\ColorThieft.Shared\ColorThieft.Shared.projitems" Label="Shared" />
+  <Import Project="..\ColorThieft.Shared\ColorThieftShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>