Convert jpegls_bitmap_frame_encode.h to named module jpegls_bitmap_fr…

…ame_encode.ixx
team-charls · Nov 20, 2023 · 2bd8ce1 · 2bd8ce1
1 parent c116848
commit 2bd8ce1
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/src/jpegls-wic-codec.vcxproj b/src/jpegls-wic-codec.vcxproj
@@ -70,7 +70,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="jpegls_bitmap_encoder.h" />
-    <ClInclude Include="jpegls_bitmap_frame_encode.h" />
     <ClInclude Include="macros.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="storage_buffer.h" />
@@ -128,7 +127,22 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="jpegls_bitmap_frame_encode.cpp" />
+    <ClCompile Include="jpegls_bitmap_frame_encode.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="jpegls_bitmap_frame_encode.ixx">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>

diff --git a/src/jpegls-wic-codec.vcxproj.filters b/src/jpegls-wic-codec.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClInclude Include="jpegls_bitmap_encoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="jpegls_bitmap_frame_encode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -72,6 +69,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="jpegls_bitmap_decoder.ixx" />
+    <ClCompile Include="jpegls_bitmap_frame_encode.ixx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="jpegls-wic-codec.def">

diff --git a/src/jpegls_bitmap_encoder.cpp b/src/jpegls_bitmap_encoder.cpp
@@ -4,12 +4,12 @@
 #include "pch.h"
 
 #include "jpegls_bitmap_encoder.h"
-
-#include "jpegls_bitmap_frame_encode.h"
+#include "trace.h"
 
 import class_factory;
 import guids;
 import errors;
+import jpegls_bitmap_frame_encode;
 
 using charls::interleave_mode;
 using charls::jpegls_encoder;

diff --git a/src/jpegls_bitmap_frame_encode.cpp b/src/jpegls_bitmap_frame_encode.cpp
@@ -1,12 +1,18 @@
 // Copyright (c) Team CharLS.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include "pch.h"
+module;
 
-#include "jpegls_bitmap_frame_encode.h"
+#include "macros.h"
+#include "trace.h"
 
 #include <mfapi.h>
 
+#include <wincodec.h>
+#include <winrt/base.h>
+
+module jpegls_bitmap_frame_encode;
+
 import errors;
 
 HRESULT __stdcall jpegls_bitmap_frame_encode::Initialize([[maybe_unused]] _In_ IPropertyBag2* encoder_options) noexcept

diff --git a/src/jpegls_bitmap_frame_encode.h → src/jpegls_bitmap_frame_encode.ixx b/src/jpegls_bitmap_frame_encode.h → src/jpegls_bitmap_frame_encode.ixx
@@ -1,16 +1,18 @@
 // Copyright (c) Team CharLS.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#pragma once
+module;
 
 #include "macros.h"
-#include "trace.h"
 
+#include <wincodec.h>
 #include <winrt/base.h>
 
 #include <charls/charls.h>
 
-class jpegls_bitmap_frame_encode final : public winrt::implements<jpegls_bitmap_frame_encode, IWICBitmapFrameEncode>
+export module jpegls_bitmap_frame_encode;
+
+export class jpegls_bitmap_frame_encode final : public winrt::implements<jpegls_bitmap_frame_encode, IWICBitmapFrameEncode>
 {
 public:
     [[nodiscard]]