Fixed #9 - problem with scaling parameters weren't working.

KFreon · Dec 29, 2016 · 8ac2da9 · 8ac2da9
1 parent 8bf6ff4
commit 8ac2da9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/CSharpImageLibrary/DDS/DDSGeneral.cs b/CSharpImageLibrary/DDS/DDSGeneral.cs
@@ -68,9 +68,9 @@ private static MipMap ReadCompressedMipMap(MemoryStream compressed, int mipWidth
                 });
 
                 // Actually perform decompression using threading, no threading, or GPU.
-                if (ImageEngine.EnableGPUAcceleration)
+                /*if (ImageEngine.EnableGPUAcceleration)
                     Debugger.Break(); 
-                else if (ImageEngine.EnableThreading)
+                else */if (ImageEngine.EnableThreading)
                     Parallel.For(0, texelCount, new ParallelOptions { MaxDegreeOfParallelism = ImageEngine.NumThreads }, (texelIndex, loopstate) => action(texelIndex, loopstate));
                 else
                     for (int texelIndex = 0; texelIndex < texelCount; texelIndex++)
@@ -258,7 +258,7 @@ internal static byte[] Save(List<MipMap> mipMaps, ImageEngineFormat saveFormat,
                     compressor = DDS_Encoders.CompressBC5Block;
                     break;
                 case ImageEngineFormat.DDS_DX10:
-                    Debugger.Break();
+                    //Debugger.Break();
                     break; // TODO: NOT SUPPORTED YET. DX10
                 case ImageEngineFormat.DDS_DXT1:
                     compressor = DDS_Encoders.CompressBC1Block;
@@ -346,9 +346,9 @@ static int WriteCompressedMipMap(byte[] destination, int mipOffset, MipMap mipma
             });
 
             // Choose an acceleration method.
-            if (ImageEngine.EnableGPUAcceleration)
+            /*if (ImageEngine.EnableGPUAcceleration)
                 Debugger.Break(); 
-            else if (ImageEngine.EnableThreading)
+            else*/ if (ImageEngine.EnableThreading)
                 Parallel.For(0, destinationTexelCount, new ParallelOptions { MaxDegreeOfParallelism = ImageEngine.NumThreads }, mipWriter);
             else
                 for (int i = 0; i < destinationTexelCount; i++)

diff --git a/CSharpImageLibrary/WIC_Codecs.cs b/CSharpImageLibrary/WIC_Codecs.cs
@@ -110,7 +110,8 @@ internal static List<MipMap> LoadWithCodecs(Stream stream, int decodeWidth, int
                     // KFreon: Skip mipmaps that are too big if asked to load a smaller image
                     if (alternateDecodeDimensions)
                     {
-                        if (mipmap.Width > alternateWidth || mipmap.Height > alternateHeight)
+                        if ((alternateWidth != 0 && mipmap.Width > alternateWidth) || 
+                            (alternateHeight != 0 && mipmap.Height > alternateHeight))
                             continue;
                     }
 
@@ -122,6 +123,16 @@ internal static List<MipMap> LoadWithCodecs(Stream stream, int decodeWidth, int
                     // KFreon: Image has no mips, so resize largest
                     var frame = decoder.Frames[0];
                     var mip = new MipMap(frame.GetPixelsAsBGRA32(), frame.PixelWidth, frame.PixelHeight);
+
+                    // Calculate scale if required
+                    if (scale == 0)
+                    {
+                        double xScale = alternateWidth * 1.0 / frame.PixelWidth;
+                        double yScale = alternateHeight * 1.0 / frame.PixelHeight;
+
+                        scale = xScale == 0 ? yScale : xScale;
+                    }
+
                     mip = ImageEngine.Resize(mip, scale);
                     mipmaps.Add(mip);
                 }

diff --git a/UI_Project/NewMainWindow.xaml b/UI_Project/NewMainWindow.xaml
@@ -769,7 +769,7 @@
                     </Canvas>
 
 
-                    <Label Content="Header Details" Grid.Column="1" FontWeight="Bold" FontSize="13" HorizontalAlignment="Center" IsHitTestVisible="False" Margin="128,0,128.333,0.333" Width="99"/>
+                    <Label Content="Header Details" Grid.Column="1" FontWeight="Bold" FontSize="13" HorizontalAlignment="Center" IsHitTestVisible="False" VerticalAlignment="Top"/>
                     <ScrollViewer Grid.Column="1" Margin="1,25,0.333,0.333" HorizontalScrollBarVisibility="Auto">
                         <TextBox Text="{Binding HeaderDetails, Mode=OneWay}" Background="Transparent" Foreground="White" FontSize="10"/>
                     </ScrollViewer>