Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek shellext: eliminated unneeded reference to GDI+

Changeset 05af3a1d5d12…

Parent 6d4f438cf832…

by David Golub

Changes to 2 files · Browse files at 05af3a1d5d12 Showing diff from parent 6d4f438cf832 Diff from another changeset...

Change 1 of 4 Show Entire File win32/​shellext/​IconBitmapUtils.cpp Stacked
 
200
201
202
203
 
204
205
206
 
220
221
222
223
 
224
225
226
 
239
240
241
242
 
243
244
245
 
263
264
265
266
 
267
268
269
 
200
201
202
 
203
204
205
206
 
220
221
222
 
223
224
225
226
 
239
240
241
 
242
243
244
245
 
263
264
265
 
266
267
268
269
@@ -200,7 +200,7 @@
  HRESULT hr = m_pfnGetBufferedPaintBits(hPaintBuffer, &prgbQuad, &cxRow);   if (SUCCEEDED(hr))   { - Gdiplus::ARGB *pargb = reinterpret_cast<Gdiplus::ARGB *>(prgbQuad); + DWORD* pargb = (DWORD*)prgbQuad;   if (!HasAlpha(pargb, sizeIcon, cxRow))   {   ICONINFO info; @@ -220,7 +220,7 @@
  return hr;  }   -bool CIconBitmapUtils::HasAlpha(Gdiplus::ARGB *pargb, SIZE& sizeImage, int cxRow) +bool CIconBitmapUtils::HasAlpha(DWORD* pargb, SIZE& sizeImage, int cxRow)  {   ULONG cxDelta = cxRow - sizeImage.cx;   for (ULONG y = sizeImage.cy; y; --y) @@ -239,7 +239,7 @@
  return false;  }   -HRESULT CIconBitmapUtils::ConvertToPARGB32(HDC hDC, Gdiplus::ARGB *pargb, HBITMAP hBitmap, +HRESULT CIconBitmapUtils::ConvertToPARGB32(HDC hDC, DWORD* pargb, HBITMAP hBitmap,   SIZE& sizeImage, int cxRow)  {   BITMAPINFO bmi; @@ -263,7 +263,7 @@
  DIB_RGB_COLORS) == bmi.bmiHeader.biHeight)   {   ULONG cxDelta = cxRow - bmi.bmiHeader.biWidth; - Gdiplus::ARGB *pargbMask = static_cast<Gdiplus::ARGB *>(pvBits); + DWORD* pargbMask = (DWORD*)pvBits;     for (ULONG y = bmi.bmiHeader.biHeight; y; --y)   {
Change 1 of 2 Show Entire File win32/​shellext/​IconBitmapUtils.h Stacked
 
19
20
21
22
23
 
24
25
26
 
47
48
49
50
51
 
 
52
53
54
 
19
20
21
 
 
22
23
24
25
 
46
47
48
 
 
49
50
51
52
53
@@ -19,8 +19,7 @@
 // Adapted for use in TortoiseHg by Veniamin Albaev    #pragma once -#include <Uxtheme.h> -#include <GdiPlus.h> +#include <uxtheme.h>    typedef HRESULT (WINAPI *FN_GetBufferedPaintBits) (HPAINTBUFFER hBufferedPaint,   RGBQUAD **ppbBuffer, int *pcxRow); @@ -47,8 +46,8 @@
  HBITMAP* phBitmap);   HRESULT ConvertBufferToPARGB32(HPAINTBUFFER hPaintBuffer, HDC hDC, HICON hIcon,   SIZE& sizeIcon); - bool HasAlpha(Gdiplus::ARGB *pargb, SIZE& sizeImage, int cxRow); - HRESULT ConvertToPARGB32(HDC hDC, Gdiplus::ARGB *pargb, HBITMAP hBitmap, + bool HasAlpha(DWORD *pargb, SIZE& sizeImage, int cxRow); + HRESULT ConvertToPARGB32(HDC hDC, DWORD* pargb, HBITMAP hBitmap,   SIZE& sizeImage, int cxRow);    private: