From dea9c030340e50324eba97c72a27c151bed12e1c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jan 2018 17:38:31 +0300 Subject: AdvaImg: - freeimage extracted to the separate library; - FI_INTERFACE removed, all references to it are replaced with direct calls of FreeImage_* functions; - unified project for AdvaImg --- plugins/TabSRMM/src/themes.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/TabSRMM/src/themes.cpp') diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 82a5cece9a..81df273536 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1734,7 +1734,7 @@ void CSkin::setupAeroSkins() FIBITMAP *fib = (FIBITMAP *)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_WCHAR | IMGL_RETURNDIB); - HBITMAP hbm = FIF->FI_CreateHBITMAPFromDIB(fib); + HBITMAP hbm = FreeImage_CreateHBITMAPFromDIB(fib); CImageItem::Colorize(hbm, GetRValue(m_dwmColorRGB), GetGValue(m_dwmColorRGB), @@ -1751,16 +1751,16 @@ void CSkin::setupAeroSkins() m_tabTop->setMetrics(bm.bmWidth, bm.bmHeight); // created inverted bitmap for bottom tabs - FIF->FI_FlipVertical(fib); + FreeImage_FlipVertical(fib); - hbm = FIF->FI_CreateHBITMAPFromDIB(fib); + hbm = FreeImage_CreateHBITMAPFromDIB(fib); CImageItem::Colorize(hbm, GetRValue(m_dwmColorRGB), GetGValue(m_dwmColorRGB), GetBValue(m_dwmColorRGB)); CImageItem::PreMultiply(hbm, 1); - FIF->FI_Unload(fib); + FreeImage_Unload(fib); GetObject(hbm, sizeof(bm), &bm); m_tabBottom = new CImageItem(4, 4, 4, 4, nullptr, hbm, IMAGE_FLAG_DIVIDED | IMAGE_PERPIXEL_ALPHA, @@ -1777,7 +1777,7 @@ void CSkin::setupAeroSkins() fib = (FIBITMAP *)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_WCHAR | IMGL_RETURNDIB); COLORREF glowColor = M.GetDword(FONTMODULE, "aeroGlow", RGB(40, 40, 255)); - hbm = FIF->FI_CreateHBITMAPFromDIB(fib); + hbm = FreeImage_CreateHBITMAPFromDIB(fib); CImageItem::Colorize(hbm, GetRValue(glowColor), GetGValue(glowColor), GetBValue(glowColor)); CImageItem::PreMultiply(hbm, 1); @@ -1788,12 +1788,12 @@ void CSkin::setupAeroSkins() m_tabGlowTop->setAlphaFormat(AC_SRC_ALPHA, 255); m_tabGlowTop->setMetrics(bm.bmWidth, bm.bmHeight); - FIF->FI_FlipVertical(fib); + FreeImage_FlipVertical(fib); - hbm = FIF->FI_CreateHBITMAPFromDIB(fib); + hbm = FreeImage_CreateHBITMAPFromDIB(fib); CImageItem::Colorize(hbm, GetRValue(glowColor), GetGValue(glowColor), GetBValue(glowColor)); CImageItem::PreMultiply(hbm, 1); - FIF->FI_Unload(fib); + FreeImage_Unload(fib); GetObject(hbm, sizeof(bm), &bm); m_tabGlowBottom = new CImageItem(4, 4, 4, 4, nullptr, hbm, IMAGE_FLAG_DIVIDED | IMAGE_PERPIXEL_ALPHA, -- cgit v1.2.3