WebPShop 0.3.3

Built with Microsoft Visual Studio Community 2019 16.9.2. Removed the Windows x86 architecture target. Added the Windows ARM64 architecture target. Tested on Windows Server 2016 Datacenter with Photoshop 2021 (v 22.3.0) x64, Release. Converted all remaining CRLF to LF for easier git autocrlf.
webmproject · Apr 9, 2021 · 9eb23a8 · 9eb23a8
1 parent 3e233f3
commit 9eb23a8
Show file tree

Hide file tree

Showing 10 changed files with 676 additions and 664 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # WebP file format plug-in for Photoshop
 
-Current plug-in version: WebPShop 0.3.2
+Current plug-in version: WebPShop 0.3.3
 
 WebPShop is a Photoshop module for opening and saving WebP images, including
 animations.
@@ -12,12 +12,12 @@ using the contents of this repository or contributing.
 
 Download the binary at https://github.com/webmproject/WebPShop/releases. \
 Direct link for Windows x64:
-https://github.com/webmproject/WebPShop/releases/download/v0.3.2/WebPShop_0_3_2_Win_x64.8bi \
-Direct link for MacOS (extract the ZIP archive afterwise):
+https://github.com/webmproject/WebPShop/releases/download/v0.3.3/WebPShop_0_3_3_Win_x64.8bi \
+Direct link for MacOS x64 (extract the ZIP archive afterwise):
 https://github.com/webmproject/WebPShop/releases/download/v0.3.2/WebPShop_0_3_2_Mac_x64.zip \
 Move the plug-in (the .8bi binary for Windows or the .plugin folder for MacOS)
 to the Photoshop plug-in directory
-(`C:\Program Files\Adobe\Adobe Photoshop\Plug-ins\` for Windows x64,
+(`C:\Program Files\Adobe\Adobe Photoshop 2021\Plug-ins\` for Windows,
 `Applications/Adobe Photoshop/Plug-ins/` for Mac). Run Photoshop.
 
 On macOS 10.15+, the prompt "WebPShop.plugin cannot be opened because
@@ -36,24 +36,22 @@ Use Microsoft Visual Studio (2017 and above) for Windows and XCode for Mac.
 
 *   Download the latest Adobe Photoshop Plug-In and Connection SDK at
     https://console.adobe.io/downloads/ps,
-*   Download the latest WebP binaries at
-    https://developers.google.com/speed/webp/docs/precompiled or build them,
 *   Put the contents of this repository in a "webpshop" folder located at
     `adobe_photoshop_sdk_[version]/pluginsdk/samplecode/format`,
+*   Download the latest WebP binaries at
+    https://developers.google.com/speed/webp/docs/precompiled or build them,
 *   Add `path/to/webp/includes` and `path/to/webp/includes/src` as Additional
     Include Directories to the WebPShop project [1],
 *   Add webp, webpdemux, webpmux libraries as Additional Dependencies to the
     WebPShop project [1],
-*   Build it with the same architecture as your Photoshop installation
-    (x86 or x64 for Windows, x64 for Mac),
-*   Build it with the same architecture and config as the WebP library binaries
-    (x86 or x64 for Windows, x64 for Mac, Debug/Release),
+*   Build with the same architecture and configuration as your Photoshop
+    installation and the WebP binaries (x64 or arm64, Debug/Release),
 *   By example for Windows, it should output the plug-in file `WebPShop.8bi` in
-    `adobe_photoshop_sdk_[version]/pluginsdk/samplecode/Output/Win/Debug[64]/`.
+    `adobe_photoshop_sdk_[version]/pluginsdk/samplecode/Output/Win/x64/Release`.
 
 [1] By default the XCode project includes and links to the
 `libwebp-[version]-mac-[version]` folder in the `webpshop` directory. The VS
-project expects `libwebp-[version]-windows-x64` (and/or `-x86`).
+project expects `libwebp-[version]-windows-x64` (or `-arm64`).
 
 ## Features
 
@@ -114,7 +112,7 @@ might help:
 
         C:\Program Files\Common Files\Adobe\Plug-Ins\CC
         C:\Program Files\Common Files\Adobe\Plug-Ins\CC\File Formats
-        C:\Program Files\Adobe\Adobe Photoshop 2020\Plug-ins
+        C:\Program Files\Adobe\Adobe Photoshop 2021\Plug-ins
 
 *   If it is still undetected, remove all plug-ins from all folders and copy
     WebPShop in only one of these folders, in case there is a plug-in conflict.
@@ -124,8 +122,8 @@ might help:
     https://www.gstatic.com/webp/gallery/4.sm.webp). The issue might come from
     unsupported encoding settings, see the limitations above.
 
-If the issue still occurs, please file a bug at
-https://github.com/webmproject/WebPShop/issues
+If the issue still occurs, check https://github.com/webmproject/WebPShop/issues
+to see if it is already mentioned or open a new bug report otherwise.
 
 ## Software architecture
 

diff --git a/common/WebPShop.r b/common/WebPShop.r
@@ -41,6 +41,7 @@
 //------------------------------------------------------------------------------
 
 #include "PIDefines.h"
+#include "PIResourceDefines.h"
 
 #if __PIMac__
 #include "PIGeneral.r"
@@ -66,14 +67,15 @@ resource 'PiPL'(webpshopResourceID, plugInName " PiPL", purgeable){
 
      Component{ComponentNumber, plugInName},
 
-#ifdef __PIMac__
-     CodeMacIntel64{"PluginMain"},
-#else
-#if defined(_WIN64)
-     CodeWin64X86{"PluginMain"},
-#else
-     CodeWin32X86{"PluginMain"},
+#if Macintosh
+#if defined(__arm64__)
+    CodeMacARM64 { "PluginMain" },
 #endif
+#if defined(__x86_64__)
+    CodeMacIntel64 { "PluginMain" },
+#endif
+#elif MSWindows
+    CodeEntryPointWin64 { "PluginMain" },
 #endif
 
      // This plug-in can read and write via POSIX I/O routines

diff --git a/docs/NEWS.md b/docs/NEWS.md
@@ -50,3 +50,11 @@
         (v 22.1.1) x64, Release.
     *   Tested on macOS Catalina Version 10.15.7 with Photoshop 2020
         (v 21.2.4) and Photoshop 2021 (v 22.1.1) x64, Release.
+
+-   09/04/2021: v0.3.3
+
+    *   Built with Microsoft Visual Studio Community 2019 16.9.2.
+    *   Removed the Windows x86 architecture target.
+    *   Added the Windows ARM64 architecture target.
+    *   Tested on Windows Server 2016 Datacenter with Photoshop 2021
+        (v 22.3.0) x64, Release.
diff --git a/mac/Info.plist b/mac/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>8BIF</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.2</string>
+	<string>0.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>8BIM</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.2</string>
+	<string>0.3.3</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2018-2020 Google LLC</string>
 </dict>

diff --git a/mac/WebPShopUI_mac.mm b/mac/WebPShopUI_mac.mm
@@ -298,8 +298,8 @@ void DoAboutBox(SPPluginRef plugin_ref) {
 
   [alert setMessageText:@"About WebPShop"];
   [alert setInformativeText:
-             @"WebPShop 0.3.2\nWebP 1.2.0\nA Photoshop plug-in for reading "
-             @"and writing WebP files.\nCopyright 2019-2020 Google LLC."];
+             @"WebPShop 0.3.3\nWebP 1.2.0\nA Photoshop plug-in for reading "
+             @"and writing WebP files.\nCopyright 2019-2021 Google LLC."];
   [alert setAlertStyle:NSAlertStyleInformational];
 
   const NSModalResponse buttonPressed = [alert runModal];

diff --git a/mac/webpshop.xcodeproj/project.pbxproj b/mac/webpshop.xcodeproj/project.pbxproj
@@ -524,7 +524,7 @@
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
 				LIBRARY_SEARCH_PATHS = "../libwebp-1.2.0-mac-10.15/lib";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.3.2;
+				MARKETING_VERSION = 0.3.3;
 				OTHER_LDFLAGS = "-v";
 				PLUGIN_TYPE = 8BIF;
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.WebPShop;

diff --git a/win/WebPShop.rc b/win/WebPShop.rc
@@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",1,171,7,11,14,NOT WS_VISIBLE | WS_DISABLED
     PUSHBUTTON      "Cancel",2,172,24,10,14,NOT WS_VISIBLE | WS_DISABLED
-    LTEXT           "WebPShop 0.3.2\nWebP 1.2.0\nA Photoshop plug-in for reading and writing WebP files.\nCopyright 2019-2020 Google LLC.",5,10,10,180,50
+    LTEXT           "WebPShop 0.3.3\nWebP 1.2.0\nA Photoshop plug-in for reading and writing WebP files.\nCopyright 2019-2021 Google LLC.",5,10,10,180,50
     PUSHBUTTON      "developers.google.com/speed/webp",10,10,60,180,20
 END
 

diff --git a/win/WebPShop.sln b/win/WebPShop.sln
@@ -1,23 +1,23 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2019
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31112.23
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebPShop", "WebPShop.vcxproj", "{73C59F9A-C645-4EE5-8F00-AB4332011062}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|Win32.Build.0 = Debug|Win32
+		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|ARM64.Build.0 = Debug|ARM64
 		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|x64.ActiveCfg = Debug|x64
 		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Debug|x64.Build.0 = Debug|x64
-		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|Win32.ActiveCfg = Release|Win32
-		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|Win32.Build.0 = Release|Win32
+		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|ARM64.ActiveCfg = Release|ARM64
+		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|ARM64.Build.0 = Release|ARM64
 		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|x64.ActiveCfg = Release|x64
 		{73C59F9A-C645-4EE5-8F00-AB4332011062}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection