..

Author: shadowmage45

Plugin/TexturesUnlimitedTools/ImageTools.cs

@@ -1,12 +1,7 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 
 namespace TexturesUnlimitedTools
@@ -18,7 +13,10 @@ public static class ImageTools
         public static Bitmap loadImage(string fileName)
         {
             Image image = Image.FromFile(fileName);
-            return new Bitmap(image);
+
+            Bitmap bmp = new Bitmap(image);
+            image.Dispose();
+            return bmp;
         }
 
         public static void saveImage(Bitmap image, string fileName)

Plugin/TexturesUnlimitedTools/MainWindow.xaml.cs

@@ -107,8 +107,8 @@ public class TextureRemapEntry : INotifyPropertyChanged
         string outputName = "";
 
         ImageChannelSelection imageR = ImageChannelSelection.Image1_R;
-        ImageChannelSelection imageG = ImageChannelSelection.Image1_B;
-        ImageChannelSelection imageB = ImageChannelSelection.Image1_G;
+        ImageChannelSelection imageG = ImageChannelSelection.Image1_G;
+        ImageChannelSelection imageB = ImageChannelSelection.Image1_B;
         ImageChannelSelection imageA = ImageChannelSelection.Image2_RGB;
 
         public ImageChannelSelection ImageR { get { return imageR; } set { imageR = value; propChanged(); } }

Plugin/TexturesUnlimitedTools/TextureCombineWindow.xaml.cs

@@ -60,14 +60,12 @@ private void ConvertImagesClick(object sender, RoutedEventArgs e)
 
         private void processEntry(TextureRemapEntry entry)
         {
-            MessageBox.Show("Processing entry...");
             Bitmap image1 = ImageTools.loadImage(entry.Image1Name);
             if (image1 == null)
             {
                 MessageBox.Show("Cannot process pair; first image is null");
                 return;
             }
-            MessageBox.Show("Loaded input image 1");
             int width = image1.Width;
             int height = image1.Height;
             Bitmap image2 = ImageTools.loadImage(entry.Image2Name);
@@ -81,7 +79,6 @@ private void processEntry(TextureRemapEntry entry)
                     return;
                 }
             }
-            MessageBox.Show("Loaded input image 2");
             Bitmap output = new Bitmap(width, height);
             Color color1, color2;
             byte r, g, b, a;