Refactor: subtractive cleanup of bloated code

- Extracted `GetDefaultBitmapProps` helper to remove duplicate D2D1 properties initialization in `RenderEngine.cpp`.
- Combined multiple `if (!deferZoomResizeSync)` conditions to remove AST duplication and dead code blocks in `main.cpp`.
- Removed unused variables from the `IsLikelyShellIconFallback` validation method and updated its call site in `main.cpp`.
- Removed redundant header includes in `ImageLoader.cpp` to optimize compilation.

Author: justnullname

QuickView/ImageLoader.cpp

@@ -30,7 +30,6 @@ using namespace QuickView;
 #include <immintrin.h> // SIMD
 #include "SIMDUtils.h"
 #include <thread>
-#include "PreviewExtractor.h"
 #include <shobjidl.h> // [Add] for IShellItemImageFactory
 #include "MappedFile.h" // [Opt]
 #if defined(__has_include)
@@ -581,16 +580,10 @@ HRESULT CImageLoader::LoadFromFile(LPCWSTR filePath, IWICBitmapSource** bitmap)
     return hr;
 }
 
-#include <turbojpeg.h>
 
 // High-Performance Library Includes
 
 #include <webp/decode.h>     // libwebp
-#include <webp/demux.h>
-#include <avif/avif.h>       // libavif
-#include <jxl/decode.h>      // libjxl
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/thread_parallel_runner.h>
 #include <libraw/libraw.h>   // libraw
 #include <wincodec.h>
 
@@ -600,13 +593,11 @@ HRESULT CImageLoader::LoadFromFile(LPCWSTR filePath, IWICBitmapSource** bitmap)
 #include <sstream>
 #include <iomanip>
 #include "exif.h"
-#include <immintrin.h> // [AVX2]
  // [v6.0] EasyExif
 #include "ImageEngine.h"
 
 // Wuffs (Google's memory-safe decoder)
 // Implementation is in WuffsImpl.cpp with selective module loading
-#include "WuffsLoader.h"
 
 // [v5.3] Global storage - kept for internal decoder use, exposed via DecodeResult.metadata
 std::wstring g_lastFormatDetails;
@@ -7392,7 +7383,6 @@ void CImageLoader::ComputeHistogramFromFrame(const QuickView::RawImageFrame& fra
 // Phase 6: Surgical Format Optimizations
 // ============================================================================
 
-#include <webp/decode.h>
 
 
 
@@ -8700,7 +8690,6 @@ CImageLoader::ImageHeaderInfo CImageLoader::PeekHeader(LPCWSTR filePath) {
 // It decodes images directly to RawImageFrame, bypassing WIC where possible.
 // ============================================================================
 
-#include "MemoryArena.h"
 
 HRESULT CImageLoader::LoadToFrame(LPCWSTR filePath, QuickView::RawImageFrame* outFrame,
                                    QuantumArena* arena,

QuickView/RenderEngine.cpp

@@ -115,6 +115,19 @@ HRESULT CRenderEngine::CreateDeviceResources() {
     return S_OK;
 }
 
+
+// Helper to standardize D2D1 bitmap properties creation
+static inline D2D1_BITMAP_PROPERTIES1 GetDefaultBitmapProps(
+    DXGI_FORMAT format = DXGI_FORMAT_B8G8R8A8_UNORM,
+    D2D1_ALPHA_MODE alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED)
+{
+    return D2D1::BitmapProperties1(
+        D2D1_BITMAP_OPTIONS_NONE,
+        D2D1::PixelFormat(format, alphaMode),
+        96.0f, 96.0f
+    );
+}
+
 HRESULT CRenderEngine::CreateBitmapFromWIC(IWICBitmapSource* wicBitmap, ID2D1Bitmap** d2dBitmap) {
     if (!wicBitmap || !d2dBitmap) return E_INVALIDARG;
 
@@ -149,10 +162,7 @@ HRESULT CRenderEngine::CreateBitmapFromWIC(IWICBitmapSource* wicBitmap, ID2D1Bit
     }
 
     // Use PREMULTIPLIED mode for proper transparency support
-    D2D1_BITMAP_PROPERTIES1 props = D2D1::BitmapProperties1(
-        D2D1_BITMAP_OPTIONS_NONE,
-        D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED)
-    );
+    D2D1_BITMAP_PROPERTIES1 props = GetDefaultBitmapProps();
 
     // Create D2D bitmap from WIC using Resource Context
     hr = m_d2dContext->CreateBitmapFromWicBitmap(
@@ -168,11 +178,7 @@ HRESULT CRenderEngine::CreateBitmapFromMemory(const void* data, UINT width, UINT
     if (!m_d2dContext) return E_POINTER;
 
     // Assume BGRX (32bpp) as standard
-    D2D1_BITMAP_PROPERTIES1 props = D2D1::BitmapProperties1(
-        D2D1_BITMAP_OPTIONS_NONE,
-        D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED),
-        96.0f, 96.0f
-    );
+    D2D1_BITMAP_PROPERTIES1 props = GetDefaultBitmapProps();
 
     return m_d2dContext->CreateBitmap(D2D1::SizeU(width, height), data, stride, &props, reinterpret_cast<ID2D1Bitmap1**>(ppBitmap));
 }
@@ -210,11 +216,7 @@ HRESULT CRenderEngine::UploadRawFrameToGPU(const QuickView::RawImageFrame& frame
             break;
     }
 
-    D2D1_BITMAP_PROPERTIES1 props = D2D1::BitmapProperties1(
-        D2D1_BITMAP_OPTIONS_NONE,
-        D2D1::PixelFormat(dxgiFormat, alphaMode),
-        96.0f, 96.0f
-    );
+    D2D1_BITMAP_PROPERTIES1 props = GetDefaultBitmapProps(dxgiFormat, alphaMode);
 
     // [Optimization] Use GPU Compute for non-native format conversion
     if (m_computeEngine && m_computeEngine->IsAvailable() && 

QuickView/main.cpp

@@ -5837,11 +5837,8 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             if (!deferZoomResizeSync) {
                 g_programmaticResize = false;
-            }
-            
-            // [DComp Fix] Update Image Layout (Fit + Zoom) logic
-            // [Refactor] Use Centralized SyncDCompState
-            if (!deferZoomResizeSync) {
+                // [DComp Fix] Update Image Layout (Fit + Zoom) logic
+                // [Refactor] Use Centralized SyncDCompState
                 RECT rc; GetClientRect(hwnd, &rc);
                 SyncDCompState(hwnd, (float)rc.right, (float)rc.bottom);
             }
@@ -9075,10 +9072,7 @@ static bool TryBuildPhase1WicEmbeddedFrame(const std::wstring& path, std::shared
 
 // With SIIGBF_THUMBNAILONLY the Shell API never returns icons.
 // This is a defensive-only check for typical Windows icon dimensions.
-static bool IsLikelyShellIconFallback(
-    const std::shared_ptr<QuickView::RawImageFrame>& frame,
-    UINT /*sourceW*/,
-    UINT /*sourceH*/) {
+static bool IsLikelyShellIconFallback(const std::shared_ptr<QuickView::RawImageFrame>& frame) {
     if (!frame || !frame->IsValid()) return false;
     int w = frame->width;
     int h = frame->height;
@@ -9190,7 +9184,7 @@ static void PrimePhase1Placeholder(HWND hwnd, const std::wstring& path, ImageID
     // Shell thumbnail: multi-level cache-only extraction (no disk decode, safe for UI thread)
     std::shared_ptr<QuickView::RawImageFrame> shellFrame;
     if (TryBuildPhase1ShellCachedFrame(path, &shellFrame)) {
-        if (IsLikelyShellIconFallback(shellFrame, sourceW, sourceH)) {
+        if (IsLikelyShellIconFallback(shellFrame)) {
             OutputDebugStringW(L"[Phase1] Shell cache returned icon-like bitmap. Treat as cache miss.\n");
         } else {
             if (ApplyPhase1PlaceholderFrame(hwnd, path, imageId, shellFrame, sourceW, sourceH, L"Shell Cache Thumbnail")) {