mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Direct2D: Move ImagePixelDataNativeExtensions into separate header

Browse source
This commit is contained in:
reuk 2025-04-09 13:38:29 +01:00 • committed by Oli
parent 5e5258591f
commit c167c6dfde
32 changed files with 284 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/DemoRunner/Builds/Android/app/CMakeLists.txt
View file

@ -1975,6 +1975,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/images/juce_ImageConvolutionKernel.h"
"../../../../../modules/juce_graphics/images/juce_ImageFileFormat.cpp"
"../../../../../modules/juce_graphics/images/juce_ImageFileFormat.h"
"../../../../../modules/juce_graphics/images/juce_ImagePixelDataNativeExtensions.h"
"../../../../../modules/juce_graphics/images/juce_ScaledImage.h"
"../../../../../modules/juce_graphics/native/juce_CoreGraphicsContext_mac.h"
"../../../../../modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm"
@ -1982,8 +1983,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DHwndContext_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DImageContext_windows.cpp"
@ -2324,6 +2323,8 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h"
"../../../../../modules/juce_gui_basics/native/juce_ContentSharer_android.cpp"
"../../../../../modules/juce_gui_basics/native/juce_ContentSharer_ios.cpp"
"../../../../../modules/juce_gui_basics/native/juce_Direct2DHwndContext_windows.cpp"
"../../../../../modules/juce_gui_basics/native/juce_Direct2DHwndContext_windows.h"
"../../../../../modules/juce_gui_basics/native/juce_DragAndDrop_linux.cpp"
"../../../../../modules/juce_gui_basics/native/juce_DragAndDrop_windows.cpp"
"../../../../../modules/juce_gui_basics/native/juce_FileChooser_android.cpp"
@ -4628,6 +4629,7 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/images/juce_ImageConvolutionKernel.h"
"../../../../../modules/juce_graphics/images/juce_ImageFileFormat.cpp"
"../../../../../modules/juce_graphics/images/juce_ImageFileFormat.h"
"../../../../../modules/juce_graphics/images/juce_ImagePixelDataNativeExtensions.h"
"../../../../../modules/juce_graphics/images/juce_ScaledImage.h"
"../../../../../modules/juce_graphics/native/juce_CoreGraphicsContext_mac.h"
"../../../../../modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm"
@ -4635,8 +4637,6 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DHwndContext_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
"../../../../../modules/juce_graphics/native/juce_Direct2DImageContext_windows.cpp"
@ -4977,6 +4977,8 @@ set_source_files_properties(
"../../../../../modules/juce_gui_basics/native/juce_CGMetalLayerRenderer_mac.h"
"../../../../../modules/juce_gui_basics/native/juce_ContentSharer_android.cpp"
"../../../../../modules/juce_gui_basics/native/juce_ContentSharer_ios.cpp"
"../../../../../modules/juce_gui_basics/native/juce_Direct2DHwndContext_windows.cpp"
"../../../../../modules/juce_gui_basics/native/juce_Direct2DHwndContext_windows.h"
"../../../../../modules/juce_gui_basics/native/juce_DragAndDrop_linux.cpp"
"../../../../../modules/juce_gui_basics/native/juce_DragAndDrop_windows.cpp"
"../../../../../modules/juce_gui_basics/native/juce_FileChooser_android.cpp"

9
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
View file

@ -2406,9 +2406,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2820,6 +2817,9 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_ContentSharer_ios.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_DragAndDrop_linux.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4413,12 +4413,12 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageCache.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageConvolutionKernel.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageFileFormat.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImagePixelDataNativeExtensions.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ScaledImage.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_CoreGraphicsContext_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_CoreGraphicsHelpers_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImageContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DMetrics_windows.h"/>
@ -4616,6 +4616,7 @@
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\accessibility\juce_UIAWindowProvider_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\accessibility\juce_WindowsUIAWrapper_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_CGMetalLayerRenderer_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_NativeModalWrapperComponent_ios.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_PerScreenDisplayLinks_mac.h"/>

15
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
View file

@ -3184,9 +3184,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
@ -3613,6 +3610,9 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_ContentSharer_ios.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_DragAndDrop_linux.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
@ -7563,6 +7563,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageFileFormat.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImagePixelDataNativeExtensions.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ScaledImage.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
@ -7578,9 +7581,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
@ -8172,6 +8172,9 @@
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_CGMetalLayerRenderer_mac.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>

9
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
View file

@ -2406,9 +2406,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2820,6 +2817,9 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_ContentSharer_ios.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_DragAndDrop_linux.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4413,12 +4413,12 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageCache.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageConvolutionKernel.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageFileFormat.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImagePixelDataNativeExtensions.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ScaledImage.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_CoreGraphicsContext_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_CoreGraphicsHelpers_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImageContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DMetrics_windows.h"/>
@ -4616,6 +4616,7 @@
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\accessibility\juce_UIAWindowProvider_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\accessibility\juce_WindowsUIAWrapper_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_CGMetalLayerRenderer_mac.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_NativeModalWrapperComponent_ios.h"/>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_PerScreenDisplayLinks_mac.h"/>

15
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
View file

@ -3184,9 +3184,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
@ -3613,6 +3610,9 @@
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_ContentSharer_ios.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_gui_basics\native\juce_DragAndDrop_linux.cpp">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClCompile>
@ -7563,6 +7563,9 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImageFileFormat.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ImagePixelDataNativeExtensions.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\images\juce_ScaledImage.h">
<Filter>JUCE Modules\juce_graphics\images</Filter>
</ClInclude>
@ -7578,9 +7581,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DHwndContext_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.h">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClInclude>
@ -8172,6 +8172,9 @@
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_CGMetalLayerRenderer_mac.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_Direct2DHwndContext_windows.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
<Filter>JUCE Modules\juce_gui_basics\native</Filter>
</ClInclude>