添加更多格式

AboutForm.cs

@@ -51,7 +51,7 @@ namespace AppStore
 
             // 初始化并添加应用信息
             infoLabel = new Label();
-            infoLabel.Text = "kortapp-z\n版本: 1.2.9\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
+            infoLabel.Text = "kortapp-z\n版本: 1.3.2\n作者: zs-yg\n一个简单、开源的应用商店\nkortapp-z是完全免费\n基于.NET8和C/C++的软件";
             infoLabel.Font = new Font("Microsoft YaHei", 12);
             infoLabel.AutoSize = false;
             infoLabel.Width = 300;

AppStore.csproj

@@ -1,41 +1,42 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
+  <PropertyGroup>
-    <NoWarn>CS8622</NoWarn>
+    <NoWarn>CS8622</NoWarn>
-  </PropertyGroup>
+  </PropertyGroup>
-
+
-  <PropertyGroup>
+  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
+    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
+    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-    <WarningsAsErrors>CS8618</WarningsAsErrors>
+    <WarningsAsErrors>CS8618</WarningsAsErrors>
-    <ApplicationIcon>img\ico\icon.ico</ApplicationIcon>
+    <ApplicationIcon>img\ico\icon.ico</ApplicationIcon>
-    <Platforms>x86;x64</Platforms>
+    <Platforms>x86;x64</Platforms>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-  </PropertyGroup>
+  </PropertyGroup>
-
+
-  <ItemGroup>
+  <ItemGroup>
-    <None Include="help.txt" />
+    <None Include="help.txt" />
-    <None Include="resource\*.exe">
+    <None Include="resource\*.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </None>
-    <None Include="img\png\*.png">
+    <None Include="img\png\*.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </None>
-    <None Include="img\jpg\*.jpg">
+    <None Include="img\jpg\*.jpg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </None>
-	<None Include="img\resource\png\*.png">
+	<None Include="img\resource\png\*.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </None>
-    <None Include="img\ico\*.ico">
+    <None Include="img\ico\*.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </None>
-  </ItemGroup>
+  </ItemGroup>
-
+
-  <ItemGroup>
+  <ItemGroup>
-    <PackageReference Include="ZXing.Net" Version="0.16.9" />
+    <PackageReference Include="SunnyUI" Version="3.8.6" />
-  </ItemGroup>
+    <PackageReference Include="ZXing.Net" Version="0.16.9" />
-
+  </ItemGroup>
-</Project>
+
+</Project>

MainForm.cs

@@ -8,14 +8,43 @@ using System.Text;
 using System.Text.Json;
 using System.Diagnostics;
 using AppStore;
+using Sunny.UI;
+using System.Runtime.InteropServices;
 
 namespace AppStore
 {
-    /// <summary>
+    public class MainForm : UIForm
-    /// 主窗体类，负责应用程序的主界面显示和交互
-    /// </summary>
-    public class MainForm : Form
     {
+        [DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn")]
+        private static extern IntPtr CreateRoundRectRgn(
+            int nLeftRect,
+            int nTopRect,
+            int nRightRect,
+            int nBottomRect,
+            int nWidthEllipse,
+            int nHeightEllipse
+        );
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize);
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmIsCompositionEnabled(ref int pfEnabled);
+
+        private struct MARGINS
+        {
+            public int leftWidth;
+            public int rightWidth;
+            public int topHeight;
+            public int bottomHeight;
+        }
+
+        private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
+        private const int DWMWCP_ROUND = 2;
+
         private static readonly string CacheDir = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
             "zsyg", "kortapp-z", ".cache");
@@ -139,10 +168,32 @@ namespace AppStore
             // 设置窗体基本属性
             // 窗体基本设置
             this.Text = "kortapp-z";
-            this.Size = new Size(1430, 1050); // 增加窗体高度
+            this.Size = new Size(1430, 1050);
-            this.MinimumSize = new Size(600, 600); // 设置最小尺寸
+            this.MinimumSize = new Size(600, 600);
             this.StartPosition = FormStartPosition.CenterScreen;
-            this.Icon = new Icon("img/ico/icon.ico"); // 设置窗体图标
+            this.Icon = new Icon("img/ico/icon.ico");
+            this.Style = UIStyle.Custom;
+            this.FormBorderStyle = FormBorderStyle.None;
+            
+            // 应用现代化圆角
+            this.Region = Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 
+                ThemeManager.FormRadius, ThemeManager.FormRadius));
+
+            // 启用窗口阴影
+            if (Environment.OSVersion.Version.Major >= 6)
+            {
+                int val = DWMWCP_ROUND;
+                DwmSetWindowAttribute(this.Handle, DWMWA_WINDOW_CORNER_PREFERENCE, ref val, sizeof(int));
+
+                MARGINS margins = new MARGINS()
+                {
+                    leftWidth = 1,
+                    rightWidth = 1,
+                    topHeight = 1,
+                    bottomHeight = 1
+                };
+                DwmExtendFrameIntoClientArea(this.Handle, ref margins);
+            }
 
             // 初始化系统托盘
             trayMenu = new ContextMenuStrip();
@@ -190,12 +241,68 @@ namespace AppStore
             // 现代化顶部导航栏
             Panel buttonPanel = new Panel();
             buttonPanel.Dock = DockStyle.Top;
-            buttonPanel.Height = 70;
+            buttonPanel.Height = 80;
             buttonPanel.BackColor = ThemeManager.ControlBackgroundColor;
-            buttonPanel.Padding = new Padding(10, 15, 10, 0);
+            buttonPanel.Padding = new Padding(15, 20, 15, 5);
             buttonPanel.AutoScroll = true;
             buttonPanel.AutoSize = true;
             buttonPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+
+            // 添加支持作者按钮
+            UIButton btnSupport = new UIButton();
+            btnSupport.Text = "支持作者";
+            btnSupport.Font = new Font("微软雅黑", 10F, FontStyle.Bold);
+            btnSupport.Size = new Size(120, 45);
+            btnSupport.Location = new Point(buttonPanel.Width - 140, 15);
+            btnSupport.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            btnSupport.Style = UIStyle.Custom;
+            btnSupport.FillColor = ThemeManager.AccentColor;
+            btnSupport.ForeColor = Color.White;
+            btnSupport.Click += (s, e) => {
+                // 使用SunnyUI的现代化MessageBox
+                var form = new UIForm();
+                form.Style = UIStyle.Custom;
+                form.Text = "支持作者";
+                form.Size = new Size(400, 200);
+                form.StartPosition = FormStartPosition.CenterParent;
+
+                var label = new Label();
+                label.Text = "您确定要前往GitHub支持作者吗？";
+                label.Font = new Font("Microsoft YaHei", 10);
+                label.AutoSize = false;
+                label.Size = new Size(300, 40);
+                label.TextAlign = ContentAlignment.MiddleCenter;
+                label.Location = new Point(50, 40);
+                form.Controls.Add(label);
+
+                var btnOK = new UIButton();
+                btnOK.Text = "确定";
+                btnOK.Style = UIStyle.Custom;
+                btnOK.Size = new Size(80, 30);
+                btnOK.Location = new Point(120, 100);
+                btnOK.Click += (s, e) => {
+                    form.DialogResult = DialogResult.OK;
+                    form.Close();
+                };
+                form.Controls.Add(btnOK);
+
+                var btnCancel = new UIButton();
+                btnCancel.Text = "取消";
+                btnCancel.Style = UIStyle.Custom;
+                btnCancel.Size = new Size(80, 30);
+                btnCancel.Location = new Point(220, 100);
+                btnCancel.Click += (s, e) => {
+                    form.DialogResult = DialogResult.Cancel;
+                    form.Close();
+                };
+                form.Controls.Add(btnCancel);
+
+                if (form.ShowDialog(this) == DialogResult.OK)
+                {
+                    Process.Start(new ProcessStartInfo("https://github.com/zs-yg/kortapp-z") { UseShellExecute = true });
+                }
+            };
+            buttonPanel.Controls.Add(btnSupport);
             
             // 导航按钮样式
             Action<Button> styleButton = (Button btn) => {
@@ -1144,6 +1251,31 @@ namespace AppStore
                 "https://ghproxy.net/https://github.com/vladelaina/Catime/releases/download/v1.1.1/catime_1.1.1.exe",
                 "img/png/catime_resize.png"));
 
+            flowPanel.Controls.Add(CreateAppCard(
+                "Cataclysm-DDA",
+                "https://ghproxy.cn/https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.H-RELEASE/cdda-windows-with-graphics-and-sounds-x64-2024-11-23-1857.zip",
+                "img/png/Cataclysm-DDA.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "gophish",
+                "https://ghproxy.cn/https://github.com/gophish/gophish/releases/download/v0.12.1/gophish-v0.12.1-windows-64bit.zip",
+                "img/png/gophish.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "NoteGen",
+                "https://ghproxy.cn/https://github.com/codexu/note-gen/releases/download/note-gen-v0.19.3/NoteGen_0.19.3_x64-setup.exe",
+                "img/png/NoteGen.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "hashcat",
+                "https://ghproxy.cn/https://github.com/hashcat/hashcat/releases/download/v6.2.6/hashcat-6.2.6.7z",
+                "img/png/hashcat.png"));
+
+            flowPanel.Controls.Add(CreateAppCard(
+                "rpg-cli",
+                "https://gh-proxy.com/https://github.com/facundoolano/rpg-cli/releases/download/1.2.0/rpg-cli-1.2.0-windows.exe",
+                ""));
+
             flowPanel.Controls.Add(CreateAppCard(
                 "fluxy",
                 "https://ghproxy.net/https://github.com/alley-rs/fluxy/releases/download/v0.1.17/fluxy_0.1.17_x64-setup.exe",

ThemeManager.cs

@@ -58,22 +58,26 @@ namespace AppStore
         }
         
         // 浅色主题颜色
-        private static readonly Color LightBackground = Color.FromArgb(255, 255, 255);
+        private static readonly Color LightBackground = Color.FromArgb(250, 250, 250);
-        private static readonly Color LightControlBackground = Color.FromArgb(240, 240, 240);
+        private static readonly Color LightControlBackground = Color.FromArgb(245, 245, 245);
-        private static readonly Color LightText = Color.FromArgb(30, 30, 30);
+        private static readonly Color LightText = Color.FromArgb(40, 40, 40);
-        private static readonly Color LightButtonHover = Color.FromArgb(230, 230, 230);
+        private static readonly Color LightButtonHover = Color.FromArgb(235, 235, 235);
-        private static readonly Color LightButtonActive = Color.FromArgb(220, 220, 220);
+        private static readonly Color LightButtonActive = Color.FromArgb(225, 225, 225);
+        private static readonly Color LightAccent = Color.FromArgb(0, 120, 215);
+        private static readonly Color LightAccentLight = Color.FromArgb(0, 150, 245);
         
         // 深色主题颜色
-        private static readonly Color DarkBackground = Color.FromArgb(30, 30, 30);
+        private static readonly Color DarkBackground = Color.FromArgb(25, 25, 25);
-        private static readonly Color DarkControlBackground = Color.FromArgb(45, 45, 45);
+        private static readonly Color DarkControlBackground = Color.FromArgb(40, 40, 40);
-        private static readonly Color DarkText = Color.FromArgb(240, 240, 240);
+        private static readonly Color DarkText = Color.FromArgb(245, 245, 245);
-        private static readonly Color DarkButtonHover = Color.FromArgb(60, 60, 60);
+        private static readonly Color DarkButtonHover = Color.FromArgb(55, 55, 55);
-        private static readonly Color DarkButtonActive = Color.FromArgb(70, 70, 70);
+        private static readonly Color DarkButtonActive = Color.FromArgb(65, 65, 65);
-        private static readonly Color DarkBorder = Color.FromArgb(80, 80, 80);
+        private static readonly Color DarkBorder = Color.FromArgb(70, 70, 70);
+        private static readonly Color DarkAccent = Color.FromArgb(0, 150, 245);
+        private static readonly Color DarkAccentLight = Color.FromArgb(0, 180, 255);
         
         // 浅色主题边框颜色
-        private static readonly Color LightBorder = Color.FromArgb(180, 180, 180);
+        private static readonly Color LightBorder = Color.FromArgb(200, 200, 200);
 
         public static event Action<ThemeMode> ThemeChanged = delegate {};
 
@@ -109,6 +113,16 @@ namespace AppStore
         public static Color BorderColor => 
             _currentTheme == ThemeMode.Light ? LightBorder : DarkBorder;
 
+        public static Color AccentColor =>
+            _currentTheme == ThemeMode.Light ? LightAccent : DarkAccent;
+
+        public static Color AccentLightColor =>
+            _currentTheme == ThemeMode.Light ? LightAccentLight : DarkAccentLight;
+
+        public static int ControlRadius => 8;
+
+        public static int FormRadius => 12;
+
         public static void ApplyTheme(Control control)
         {
             ApplyThemeToControl(control);
@@ -125,6 +139,9 @@ namespace AppStore
                 button.FlatAppearance.BorderSize = 0;
                 button.FlatAppearance.MouseOverBackColor = ButtonHoverColor;
                 button.FlatAppearance.MouseDownBackColor = ButtonActiveColor;
+                button.BackColor = ControlBackgroundColor;
+                button.Font = new Font(button.Font, FontStyle.Bold);
+                button.Padding = new Padding(10, 5, 10, 5);
             }
 
             foreach (Control childControl in control.Controls)

inno/innosetup_x64.iss

@@ -2,7 +2,7 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.2.9"
+#define MyAppVersion "1.3.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
 #define MyAppExeName "kortapp-z.exe"

inno/innosetup_x86.iss

@@ -2,7 +2,7 @@
 ; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
 
 #define MyAppName "kortapp-z"
-#define MyAppVersion "1.2.9"
+#define MyAppVersion "1.3.2"
 #define MyAppPublisher "zsyg"
 #define MyAppURL "https://github.com/zs-yg/kortapp-z"
 #define MyAppExeName "kortapp-z.exe"

others/C++/Image_format_converter/Makefile

@@ -7,7 +7,12 @@ SRC = src/main.cpp src/gui.cpp src/utils.cpp src/stb_impl.cpp \
       src/bmp_to_png.cpp src/bmp_to_jpg.cpp src/png_to_bmp.cpp \
       src/jpg_to_bmp.cpp src/tiff_to_bmp.cpp src/bmp_to_tiff.cpp \
       src/tiff_to_png.cpp src/png_to_tiff.cpp src/tiff_to_jpg.cpp \
-      src/jpg_to_tiff.cpp
+      src/jpg_to_tiff.cpp src/webp_to_jpg.cpp src/webp_to_png.cpp \
+      src/webp_to_bmp.cpp src/webp_to_tiff.cpp src/jpg_to_webp.cpp \
+      src/png_to_webp.cpp src/bmp_to_webp.cpp src/tiff_to_webp.cpp \
+      src/jpeg_to_png.cpp src/jpeg_to_bmp.cpp src/jpeg_to_tiff.cpp \
+      src/jpeg_to_webp.cpp src/png_to_jpeg.cpp src/bmp_to_jpeg.cpp \
+      src/tiff_to_jpeg.cpp src/webp_to_jpeg.cpp
 OBJ = $(SRC:src/%.cpp=obj/%.o)
 TARGET = image_converter
 

others/C++/Image_format_converter/include/bmp_to_jpeg.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class BmpToJpegConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/bmp_to_webp.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class BmpToWebpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/common.hpp

@@ -17,6 +17,7 @@ enum class ImageFormat {
     PNG,
     JPG,
     TIFF,
+    WEBP,
     UNKNOWN
 };
 

others/C++/Image_format_converter/include/jpeg_to_bmp.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class JpegToBmpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/jpeg_to_png.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class JpegToPngConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/jpeg_to_tiff.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class JpegToTiffConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/jpeg_to_webp.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class JpegToWebpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/jpg_to_webp.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class JpgToWebpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/png_to_jpeg.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class PngToJpegConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/png_to_webp.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class PngToWebpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/tiff_to_jpeg.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class TiffToJpegConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/tiff_to_webp.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class TiffToWebpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/webp_to_bmp.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class WebpToBmpConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/webp_to_jpeg.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class WebpToJpegConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/webp_to_jpg.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class WebpToJpgConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path,
+                      int quality = 90);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/webp_to_png.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class WebpToPngConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/include/webp_to_tiff.hpp

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+#include "common.hpp"
+
+class WebpToTiffConverter {
+public:
+    static bool convert(const std::string& input_path,
+                      const std::string& output_path);
+    
+private:
+    static bool validate_input(const ImageData& data);
+};

others/C++/Image_format_converter/src/bmp_to_jpeg.cpp

@@ -0,0 +1,35 @@
+#include "bmp_to_jpeg.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <stb/stb_image.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool BmpToJpegConverter::convert(const std::string& input_path,
+                              const std::string& output_path,
+                              int quality) {
+    // 加载BMP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为JPEG
+    return stbi_write_jpg(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        quality);
+}
+
+bool BmpToJpegConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/bmp_to_webp.cpp

@@ -0,0 +1,61 @@
+#include "bmp_to_webp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/encode.h>
+#include <string>
+
+bool BmpToWebpConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载BMP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 编码为WebP
+    uint8_t* output = nullptr;
+    size_t output_size;
+    if (data.channels == 3) {
+        output_size = WebPEncodeRGB(data.pixels.get(),
+                                  data.width,
+                                  data.height,
+                                  data.width * data.channels,
+                                  quality,
+                                  &output);
+    } else {
+        output_size = WebPEncodeRGBA(data.pixels.get(),
+                                   data.width,
+                                   data.height,
+                                   data.width * data.channels,
+                                   quality,
+                                   &output);
+    }
+
+    if (output_size == 0) {
+        return false;
+    }
+
+    // 保存WebP文件
+    FILE* file = fopen(output_path.c_str(), "wb");
+    if (!file) {
+        WebPFree(output);
+        return false;
+    }
+
+    fwrite(output, 1, output_size, file);
+    fclose(file);
+    WebPFree(output);
+    return true;
+}
+
+bool BmpToWebpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/gui.cpp

@@ -12,6 +12,22 @@
 #include "png_to_tiff.hpp"
 #include "tiff_to_jpg.hpp"
 #include "jpg_to_tiff.hpp"
+#include "webp_to_jpg.hpp"
+#include "webp_to_png.hpp"
+#include "webp_to_bmp.hpp"
+#include "webp_to_tiff.hpp"
+#include "jpg_to_webp.hpp"
+#include "png_to_webp.hpp"
+#include "bmp_to_webp.hpp"
+#include "tiff_to_webp.hpp"
+#include "jpeg_to_png.hpp"
+#include "jpeg_to_bmp.hpp"
+#include "jpeg_to_tiff.hpp"
+#include "jpeg_to_webp.hpp"
+#include "png_to_jpeg.hpp"
+#include "bmp_to_jpeg.hpp"
+#include "tiff_to_jpeg.hpp"
+#include "webp_to_jpeg.hpp"
 #include <FL/Fl_File_Chooser.H>
 #include <FL/fl_ask.H>
 #include <stdexcept>
@@ -45,6 +61,22 @@ MainWindow::MainWindow(int w, int h, const char* title)
     format_choice->add("PNG to TIFF");
     format_choice->add("TIFF to JPG");
     format_choice->add("JPG to TIFF");
+    format_choice->add("WEBP to JPG");
+    format_choice->add("WEBP to PNG");
+    format_choice->add("WEBP to BMP");
+    format_choice->add("WEBP to TIFF");
+    format_choice->add("JPG to WEBP");
+    format_choice->add("PNG to WEBP");
+    format_choice->add("BMP to WEBP");
+    format_choice->add("TIFF to WEBP");
+    format_choice->add("JPEG to PNG");
+    format_choice->add("JPEG to BMP");
+    format_choice->add("JPEG to TIFF");
+    format_choice->add("JPEG to WEBP");
+    format_choice->add("PNG to JPEG");
+    format_choice->add("BMP to JPEG");
+    format_choice->add("TIFF to JPEG");
+    format_choice->add("WEBP to JPEG");
     format_choice->value(0);
     
     convert_btn = new Fl_Button(150, 150, 100, 30, "转换");
@@ -122,6 +154,54 @@ void MainWindow::convert_cb(Fl_Widget* w, void* data) {
             case 11: // JPG to TIFF
                 success = JpgToTiffConverter::convert(input, output);
                 break;
+            case 12: // WEBP to JPG
+                success = WebpToJpgConverter::convert(input, output);
+                break;
+            case 13: // WEBP to PNG
+                success = WebpToPngConverter::convert(input, output);
+                break;
+            case 14: // WEBP to BMP
+                success = WebpToBmpConverter::convert(input, output);
+                break;
+            case 15: // WEBP to TIFF
+                success = WebpToTiffConverter::convert(input, output);
+                break;
+            case 16: // JPG to WEBP
+                success = JpgToWebpConverter::convert(input, output);
+                break;
+            case 17: // PNG to WEBP
+                success = PngToWebpConverter::convert(input, output);
+                break;
+            case 18: // BMP to WEBP
+                success = BmpToWebpConverter::convert(input, output);
+                break;
+            case 19: // TIFF to WEBP
+                success = TiffToWebpConverter::convert(input, output);
+                break;
+            case 20: // JPEG to PNG
+                success = JpegToPngConverter::convert(input, output);
+                break;
+            case 21: // JPEG to BMP
+                success = JpegToBmpConverter::convert(input, output);
+                break;
+            case 22: // JPEG to TIFF
+                success = JpegToTiffConverter::convert(input, output);
+                break;
+            case 23: // JPEG to WEBP
+                success = JpegToWebpConverter::convert(input, output);
+                break;
+            case 24: // PNG to JPEG
+                success = PngToJpegConverter::convert(input, output);
+                break;
+            case 25: // BMP to JPEG
+                success = BmpToJpegConverter::convert(input, output);
+                break;
+            case 26: // TIFF to JPEG
+                success = TiffToJpegConverter::convert(input, output);
+                break;
+            case 27: // WEBP to JPEG
+                success = WebpToJpegConverter::convert(input, output);
+                break;
         }
         if (!success) throw std::runtime_error("转换失败");
     } catch (const std::exception& e) {

others/C++/Image_format_converter/src/image_loader.cpp

@@ -2,32 +2,108 @@
 #include "common.hpp"
 #include <stb/stb_image.h>
 #include <stb/stb_image_write.h>
+#include <webp/decode.h>
+#include <fstream>
 #include <stdexcept>
 #include <iostream>
+#include <cstring>
+
+static bool is_webp_file(const std::string& path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file) return false;
+    
+    char header[12];
+    if (!file.read(header, 12)) return false;
+    
+    return !memcmp(header, "RIFF", 4) && !memcmp(header + 8, "WEBP", 4);
+}
 
 ImageData ImageLoader::load(const std::string& path) {
     ImageData data;
     
-    // 加载图像
+    // 检查是否为WebP格式
-    unsigned char* pixels = stbi_load(path.c_str(), 
+    if (is_webp_file(path)) {
-                                     &data.width, 
+        // 读取WebP文件数据
-                                     &data.height, 
+        std::ifstream file(path, std::ios::binary | std::ios::ate);
-                                     &data.channels, 
+        if (!file) {
-                                     0);
+            throw std::runtime_error("无法打开WebP文件");
-    if (!pixels) {
+        }
-        throw std::runtime_error("无法加载图像: " + std::string(stbi_failure_reason()));
+        
+        size_t size = file.tellg();
+        file.seekg(0, std::ios::beg);
+        
+        std::vector<uint8_t> webp_data(size);
+        if (!file.read(reinterpret_cast<char*>(webp_data.data()), size)) {
+            throw std::runtime_error("无法读取WebP文件");
+        }
+        
+        // 解码WebP图像
+        WebPBitstreamFeatures features;
+        if (WebPGetFeatures(webp_data.data(), webp_data.size(), &features) != VP8_STATUS_OK) {
+            throw std::runtime_error("无效的WebP图像");
+        }
+        
+        data.width = features.width;
+        data.height = features.height;
+        data.channels = features.has_alpha ? 4 : 3;
+        
+        // 解码WebP图像为RGBA格式
+        uint8_t* rgba_pixels = WebPDecodeRGBA(webp_data.data(), webp_data.size(), &data.width, &data.height);
+        if (!rgba_pixels) {
+            throw std::runtime_error("无法解码WebP图像");
+        }
+        
+        // 如果没有alpha通道，转换为RGB格式
+        if (data.channels == 3) {
+            uint8_t* rgb_pixels = new uint8_t[data.width * data.height * 3];
+            for (int i = 0; i < data.width * data.height; ++i) {
+                rgb_pixels[i*3] = rgba_pixels[i*4];
+                rgb_pixels[i*3+1] = rgba_pixels[i*4+1];
+                rgb_pixels[i*3+2] = rgba_pixels[i*4+2];
+            }
+            WebPFree(rgba_pixels);
+            
+            // 验证图像数据
+            try {
+                validate_image(rgb_pixels, data.width, data.height);
+            } catch (...) {
+                delete[] rgb_pixels;
+                throw;
+            }
+            
+            data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(rgb_pixels, [](void* p) { delete[] static_cast<uint8_t*>(p); });
+        } else {
+            // 验证图像数据
+            try {
+                validate_image(rgba_pixels, data.width, data.height);
+            } catch (...) {
+                WebPFree(rgba_pixels);
+                throw;
+            }
+            
+            data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(rgba_pixels, WebPFree);
+        }
+    } else {
+        // 使用STB加载其他格式图像
+        unsigned char* pixels = stbi_load(path.c_str(), 
+                                         &data.width, 
+                                         &data.height, 
+                                         &data.channels, 
+                                         0);
+        if (!pixels) {
+            throw std::runtime_error("无法加载图像: " + std::string(stbi_failure_reason()));
+        }
+        
+        // 验证图像数据
+        try {
+            validate_image(pixels, data.width, data.height);
+        } catch (...) {
+            stbi_image_free(pixels);
+            throw;
+        }
+        
+        data.pixels = std::unique_ptr<unsigned char, void(*)(void*)>(pixels, stbi_image_free);
     }
-
-    // 验证图像数据
-    try {
-        validate_image(pixels, data.width, data.height);
-    } catch (...) {
-        stbi_image_free(pixels);
-        throw;
-    }
-
-    // 转移所有权到智能指针
-    data.pixels.reset(pixels);
     return data;
 }
 

others/C++/Image_format_converter/src/jpeg_to_bmp.cpp

@@ -0,0 +1,33 @@
+#include "jpeg_to_bmp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <stb/stb_image.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool JpegToBmpConverter::convert(const std::string& input_path,
+                              const std::string& output_path) {
+    // 加载JPEG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为BMP
+    return stbi_write_bmp(output_path.c_str(),
+                         data.width,
+                         data.height,
+                         data.channels,
+                         data.pixels.get());
+}
+
+bool JpegToBmpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 1 || data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/jpeg_to_png.cpp

@@ -0,0 +1,34 @@
+#include "jpeg_to_png.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <stb/stb_image.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool JpegToPngConverter::convert(const std::string& input_path,
+                              const std::string& output_path) {
+    // 加载JPEG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为PNG
+    return stbi_write_png(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        data.width * data.channels);
+}
+
+bool JpegToPngConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 1 || data.channels == 3);
+}

others/C++/Image_format_converter/src/jpeg_to_tiff.cpp

@@ -0,0 +1,61 @@
+#include "jpeg_to_tiff.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <tiffio.h>
+#include <stb/stb_image.h>
+#include <string>
+
+bool JpegToTiffConverter::convert(const std::string& input_path,
+                               const std::string& output_path) {
+    // 加载JPEG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 创建TIFF文件
+    TIFF* tif = TIFFOpen(output_path.c_str(), "w");
+    if (!tif) {
+        return false;
+    }
+
+    // 设置TIFF标签
+    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
+    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
+    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
+    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+    
+    // 根据通道数设置PhotometricInterpretation
+    if (data.channels == 1) {
+        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
+    } else if (data.channels == 3 || data.channels == 4) {
+        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+    } else {
+        TIFFClose(tif);
+        return false;
+    }
+
+    // 写入图像数据
+    tsize_t linebytes = data.width * data.channels;
+    unsigned char* buf = (unsigned char*)_TIFFmalloc(linebytes);
+    for (int y = 0; y < data.height; y++) {
+        memcpy(buf, &data.pixels.get()[y * linebytes], linebytes);
+        TIFFWriteScanline(tif, buf, y, 0);
+    }
+
+    _TIFFfree(buf);
+    TIFFClose(tif);
+    return true;
+}
+
+bool JpegToTiffConverter::validate_input(const ImageData& data) {
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 1 || data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/jpeg_to_webp.cpp

@@ -0,0 +1,61 @@
+#include "jpeg_to_webp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/encode.h>
+#include <string>
+
+bool JpegToWebpConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载JPEG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 编码为WebP
+    uint8_t* output = nullptr;
+    size_t output_size;
+    if (data.channels == 3) {
+        output_size = WebPEncodeRGB(data.pixels.get(),
+                                  data.width,
+                                  data.height,
+                                  data.width * data.channels,
+                                  quality,
+                                  &output);
+    } else {
+        output_size = WebPEncodeRGBA(data.pixels.get(),
+                                   data.width,
+                                   data.height,
+                                   data.width * data.channels,
+                                   quality,
+                                   &output);
+    }
+
+    if (output_size == 0) {
+        return false;
+    }
+
+    // 保存WebP文件
+    FILE* file = fopen(output_path.c_str(), "wb");
+    if (!file) {
+        WebPFree(output);
+        return false;
+    }
+
+    fwrite(output, 1, output_size, file);
+    fclose(file);
+    WebPFree(output);
+    return true;
+}
+
+bool JpegToWebpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/jpg_to_webp.cpp

@@ -0,0 +1,61 @@
+#include "jpg_to_webp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/encode.h>
+#include <string>
+
+bool JpgToWebpConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载JPG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 编码为WebP
+    uint8_t* output = nullptr;
+    size_t output_size;
+    if (data.channels == 3) {
+        output_size = WebPEncodeRGB(data.pixels.get(),
+                                  data.width,
+                                  data.height,
+                                  data.width * data.channels,
+                                  quality,
+                                  &output);
+    } else {
+        output_size = WebPEncodeRGBA(data.pixels.get(),
+                                   data.width,
+                                   data.height,
+                                   data.width * data.channels,
+                                   quality,
+                                   &output);
+    }
+
+    if (output_size == 0) {
+        return false;
+    }
+
+    // 保存WebP文件
+    FILE* file = fopen(output_path.c_str(), "wb");
+    if (!file) {
+        WebPFree(output);
+        return false;
+    }
+
+    fwrite(output, 1, output_size, file);
+    fclose(file);
+    WebPFree(output);
+    return true;
+}
+
+bool JpgToWebpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/png_to_jpeg.cpp

@@ -0,0 +1,35 @@
+#include "png_to_jpeg.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <stb/stb_image.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool PngToJpegConverter::convert(const std::string& input_path, 
+                              const std::string& output_path,
+                              int quality) {
+    // 加载PNG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为JPEG
+    return stbi_write_jpg(output_path.c_str(), 
+                         data.width, 
+                         data.height, 
+                         data.channels, 
+                         data.pixels.get(), 
+                         quality);
+}
+
+bool PngToJpegConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/png_to_webp.cpp

@@ -0,0 +1,61 @@
+#include "png_to_webp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/encode.h>
+#include <string>
+
+bool PngToWebpConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载PNG图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 编码为WebP
+    uint8_t* output = nullptr;
+    size_t output_size;
+    if (data.channels == 3) {
+        output_size = WebPEncodeRGB(data.pixels.get(),
+                                  data.width,
+                                  data.height,
+                                  data.width * data.channels,
+                                  quality,
+                                  &output);
+    } else {
+        output_size = WebPEncodeRGBA(data.pixels.get(),
+                                   data.width,
+                                   data.height,
+                                   data.width * data.channels,
+                                   quality,
+                                   &output);
+    }
+
+    if (output_size == 0) {
+        return false;
+    }
+
+    // 保存WebP文件
+    FILE* file = fopen(output_path.c_str(), "wb");
+    if (!file) {
+        WebPFree(output);
+        return false;
+    }
+
+    fwrite(output, 1, output_size, file);
+    fclose(file);
+    WebPFree(output);
+    return true;
+}
+
+bool PngToWebpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/tiff_to_jpeg.cpp

@@ -0,0 +1,73 @@
+#include "tiff_to_jpeg.hpp"
+#include "common.hpp"
+#include <tiffio.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool TiffToJpegConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 使用libtiff加载TIFF图像
+    TIFF* tif = TIFFOpen(input_path.c_str(), "r");
+    if (!tif) {
+        return false;
+    }
+
+    // 获取图像信息
+    uint32 width, height;
+    TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width);
+    TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
+    
+    // 获取TIFF格式信息
+    uint16 samplesperpixel, bitspersample, photometric;
+    TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesperpixel);
+    TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitspersample);
+    TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
+
+    // 验证TIFF格式
+    if (bitspersample != 8) {
+        TIFFClose(tif);
+        return false;
+    }
+
+    // 设置输出通道数
+    ImageData data;
+    data.width = width;
+    data.height = height;
+    data.channels = samplesperpixel;
+    data.pixels.reset(new unsigned char[width * height * data.channels]);
+
+    // 读取图像数据
+    tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
+    for (uint32 row = 0; row < height; row++) {
+        if (TIFFReadScanline(tif, buf, row) == -1) {
+            _TIFFfree(buf);
+            TIFFClose(tif);
+            return false;
+        }
+        memcpy(&data.pixels.get()[row * width * data.channels], 
+              buf, 
+              width * data.channels);
+    }
+
+    _TIFFfree(buf);
+    TIFFClose(tif);
+
+    // 验证输入
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为JPEG
+    return stbi_write_jpg(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        quality);
+}
+
+bool TiffToJpegConverter::validate_input(const ImageData& data) {
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 1 || data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/tiff_to_webp.cpp

@@ -0,0 +1,61 @@
+#include "tiff_to_webp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/encode.h>
+#include <string>
+
+bool TiffToWebpConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载TIFF图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 编码为WebP
+    uint8_t* output = nullptr;
+    size_t output_size;
+    if (data.channels == 3) {
+        output_size = WebPEncodeRGB(data.pixels.get(),
+                                  data.width,
+                                  data.height,
+                                  data.width * data.channels,
+                                  quality,
+                                  &output);
+    } else {
+        output_size = WebPEncodeRGBA(data.pixels.get(),
+                                   data.width,
+                                   data.height,
+                                   data.width * data.channels,
+                                   quality,
+                                   &output);
+    }
+
+    if (output_size == 0) {
+        return false;
+    }
+
+    // 保存WebP文件
+    FILE* file = fopen(output_path.c_str(), "wb");
+    if (!file) {
+        WebPFree(output);
+        return false;
+    }
+
+    fwrite(output, 1, output_size, file);
+    fclose(file);
+    WebPFree(output);
+    return true;
+}
+
+bool TiffToWebpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/utils.cpp

@@ -7,5 +7,7 @@ ImageFormat get_format_from_extension(const std::string& path) {
     
     if (ext == "png") return ImageFormat::PNG;
     if (ext == "jpg" || ext == "jpeg") return ImageFormat::JPG;
+    if (ext == "tif" || ext == "tiff") return ImageFormat::TIFF;
+    if (ext == "webp") return ImageFormat::WEBP;
     return ImageFormat::UNKNOWN;
 }

others/C++/Image_format_converter/src/webp_to_bmp.cpp

@@ -0,0 +1,33 @@
+#include "webp_to_bmp.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/decode.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool WebpToBmpConverter::convert(const std::string& input_path,
+                               const std::string& output_path) {
+    // 加载WebP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为BMP
+    return stbi_write_bmp(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get());
+}
+
+bool WebpToBmpConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/webp_to_jpeg.cpp

@@ -0,0 +1,35 @@
+#include "webp_to_jpeg.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/decode.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool WebpToJpegConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载WebP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为JPEG
+    return stbi_write_jpg(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        quality);
+}
+
+bool WebpToJpegConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/webp_to_jpg.cpp

@@ -0,0 +1,35 @@
+#include "webp_to_jpg.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/decode.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool WebpToJpgConverter::convert(const std::string& input_path,
+                               const std::string& output_path,
+                               int quality) {
+    // 加载WebP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为JPG
+    return stbi_write_jpg(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        quality);
+}
+
+bool WebpToJpgConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/webp_to_png.cpp

@@ -0,0 +1,34 @@
+#include "webp_to_png.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/decode.h>
+#include <stb/stb_image_write.h>
+#include <string>
+
+bool WebpToPngConverter::convert(const std::string& input_path,
+                               const std::string& output_path) {
+    // 加载WebP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 保存为PNG
+    return stbi_write_png(output_path.c_str(),
+                        data.width,
+                        data.height,
+                        data.channels,
+                        data.pixels.get(),
+                        data.width * data.channels);
+}
+
+bool WebpToPngConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C++/Image_format_converter/src/webp_to_tiff.cpp

@@ -0,0 +1,78 @@
+#include "webp_to_tiff.hpp"
+#include "common.hpp"
+#include "image_loader.hpp"
+#include <webp/decode.h>
+#include <tiffio.h>
+#include <string>
+
+bool WebpToTiffConverter::convert(const std::string& input_path,
+                               const std::string& output_path) {
+    // 加载WebP图像
+    ImageData data = ImageLoader::load(input_path);
+    if (!data.pixels) {
+        return false;
+    }
+
+    // 验证输入格式
+    if (!validate_input(data)) {
+        return false;
+    }
+
+    // 创建TIFF文件
+    TIFF* tif = TIFFOpen(output_path.c_str(), "w");
+    if (!tif) {
+        return false;
+    }
+
+    // 设置TIFF文件参数
+    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, data.width);
+    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, data.height);
+    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, data.channels);
+    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+    TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, 
+                data.channels == 3 ? PHOTOMETRIC_RGB : PHOTOMETRIC_MINISBLACK);
+    TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
+
+    // 写入图像数据
+    tsize_t linebytes = data.width * data.channels;
+    unsigned char* buf = nullptr;
+    if (TIFFScanlineSize(tif) == linebytes) {
+        buf = (unsigned char*)data.pixels.get() + 
+             (data.height - 1) * linebytes;
+        for (uint32 row = 0; row < data.height; row++) {
+            if (TIFFWriteScanline(tif, buf, row, 0) < 0) {
+                TIFFClose(tif);
+                return false;
+            }
+            buf -= linebytes;
+        }
+    } else {
+        buf = (unsigned char*)_TIFFmalloc(linebytes);
+        if (!buf) {
+            TIFFClose(tif);
+            return false;
+        }
+        unsigned char* src = (unsigned char*)data.pixels.get();
+        for (uint32 row = 0; row < data.height; row++) {
+            memcpy(buf, src, linebytes);
+            if (TIFFWriteScanline(tif, buf, row, 0) < 0) {
+                _TIFFfree(buf);
+                TIFFClose(tif);
+                return false;
+            }
+            src += linebytes;
+        }
+        _TIFFfree(buf);
+    }
+
+    TIFFClose(tif);
+    return true;
+}
+
+bool WebpToTiffConverter::validate_input(const ImageData& data) {
+    // 确保是有效的图像数据
+    return data.width > 0 && data.height > 0 && 
+          (data.channels == 3 || data.channels == 4);
+}

others/C/memory/Makefile

@@ -1,6 +1,6 @@
 CC = gcc
 CFLAGS = -Wall -Wextra -I./include
-LDFLAGS = -Wl,-subsystem,windows -municode -luser32 -lgdi32 -lcomctl32 -lpsapi
+LDFLAGS = -static -Wl,-subsystem,windows -municode -luser32 -lgdi32 -lcomctl32 -lpsapi
 SRC = src/main.c src/memory_ops.c src/ui.c src/init.c \
       src/utils.c src/config.c src/benchmark.c src/log.c \
       src/error.c src/version.c