diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-04-14 16:13:41 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-04-14 16:13:41 +0000 |
| commit | 320e707ce83310093e240fb4779258a201d37b82 (patch) | |
| tree | 433f00c39d492552f92991a9fbe914292da149b9 /plugins/Popup | |
| parent | ac093517c8a975f51d8a696c34a6f75ce3a7fd10 (diff) | |
switch to correct parameter types
git-svn-id: http://svn.miranda-ng.org/main/trunk@12817 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup')
| -rw-r--r-- | plugins/Popup/src/avatars_gif.cpp | 2 | ||||
| -rw-r--r-- | plugins/Popup/src/opt_skins.cpp | 2 | ||||
| -rw-r--r-- | plugins/Popup/src/popup_gdiplus.cpp | 21 | ||||
| -rw-r--r-- | plugins/Popup/src/popup_gdiplus.h | 2 |
4 files changed, 13 insertions, 14 deletions
diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp index 3a37a16612..cc935feccb 100644 --- a/plugins/Popup/src/avatars_gif.cpp +++ b/plugins/Popup/src/avatars_gif.cpp @@ -69,7 +69,7 @@ void GifAvatar::draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS *op frameDelays = NULL;
}
if (hBitmap) DeleteObject(hBitmap);
- GDIPlus_ExtractAnimatedGIF(av->szFilename, w, h, &hBitmap, &frameDelays, &frameCount, &frameSize);
+ GDIPlus_ExtractAnimatedGIF(av->szFilename, w, h, hBitmap, frameDelays, frameCount, frameSize);
}
if (!frameCount) return;
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index d33d63c26a..409e906ab4 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -198,7 +198,7 @@ int SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos return pos;
}
-// // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // /
+/////////////////////////////////////////////////////////////////////////////////////////
static LPTSTR mainOption [] = {
LPGENT("Show clock"),
diff --git a/plugins/Popup/src/popup_gdiplus.cpp b/plugins/Popup/src/popup_gdiplus.cpp index bf81780e79..aeee9ecb03 100644 --- a/plugins/Popup/src/popup_gdiplus.cpp +++ b/plugins/Popup/src/popup_gdiplus.cpp @@ -64,7 +64,7 @@ void UnloadGDIPlus() using namespace Gdiplus;
-// // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // /
+/////////////////////////////////////////////////////////////////////////////////
// GDIPlus_IsAnimatedGIF and GDIPlus_ExtractAnimatedGIF
// based on routine from http:// www.codeproject.com/vcpp/gdiplus/imageexgdi.asp
//
@@ -118,7 +118,7 @@ BOOL GDIPlus_IsAnimatedGIF(TCHAR * szName) return (BOOL)(nFrameCount > 1) && image.GetWidth() && image.GetHeight();
}
-void GDIPlus_GetGIFSize(TCHAR * szName, int * width, int * height)
+void GDIPlus_GetGIFSize(TCHAR *szName, int *width, int *height)
{
Image image(szName);
@@ -126,7 +126,7 @@ void GDIPlus_GetGIFSize(TCHAR * szName, int * width, int * height) *height = image.GetHeight();
}
-void GDIPlus_ExtractAnimatedGIF(TCHAR * szName, int width, int height, HBITMAP * pBitmap, int ** pframesDelay, int * pframesCount, SIZE * pSizeAvatar)
+void GDIPlus_ExtractAnimatedGIF(TCHAR *szName, int width, int height, HBITMAP &pBitmap, int* &pframesDelay, int &pframesCount, SIZE &pSizeAvatar)
{
int nFrameCount = 0;
Bitmap image(szName);
@@ -186,13 +186,12 @@ void GDIPlus_ExtractAnimatedGIF(TCHAR * szName, int width, int height, HBITMAP * mir_free(pPropertyItem);
pPropertyItem = NULL;
delete[]pDimensionIDs;
- if (pBitmap && pframesDelay && pframesCount && pSizeAvatar)
- {
- *pBitmap = hBitmap;
- *pframesDelay = delays;
- *pframesCount = nFrameCount;
- pSizeAvatar->cx = clipWidth;
- pSizeAvatar->cy = clipHeight;
- }
+
+ pBitmap = hBitmap;
+ pframesDelay = delays;
+ pframesCount = nFrameCount;
+ pSizeAvatar.cx = clipWidth;
+ pSizeAvatar.cy = clipHeight;
+
GdiFlush();
}
diff --git a/plugins/Popup/src/popup_gdiplus.h b/plugins/Popup/src/popup_gdiplus.h index acdec1f3d8..bd67c5efd2 100644 --- a/plugins/Popup/src/popup_gdiplus.h +++ b/plugins/Popup/src/popup_gdiplus.h @@ -28,6 +28,6 @@ void UnloadGDIPlus(); BOOL GDIPlus_IsAnimatedGIF(TCHAR * szName);
void GDIPlus_GetGIFSize(TCHAR * szName, int * width, int * height);
-void GDIPlus_ExtractAnimatedGIF(TCHAR * szName, int width, int height, HBITMAP * pBitmap, int ** pframesDelay, int * pframesCount, SIZE * pSizeAvatar);
+void GDIPlus_ExtractAnimatedGIF(TCHAR *szName, int width, int height, HBITMAP &pBitmap, int* &pframesDelay, int &pframesCount, SIZE &pSizeAvatar);
#endif // __popup_gdiplus_h__
|