adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential crash with truecolor oscill image and make oscill more flexible; bug #729

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1721 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-05-06 15:02:23 +00:00
parent 78adc95113
commit 24b63d16a4
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/oscill.c
+14 -4
View File
@@ -37,11 +37,21 @@ InitOscilloscope (DWORD x, DWORD y, DWORD width, DWORD height, FRAME f)
if (!scope_init) if (!scope_init)
{ {
TFB_Canvas scope_bg_canvas, scope_surf_canvas; TFB_Canvas scope_bg_canvas, scope_surf_canvas;
if (TFB_DrawCanvas_IsPaletted (scope_frame->image->NormalImg))
{
scope_bg_canvas = TFB_DrawCanvas_New_Paletted (width, height, scope_bg_canvas = TFB_DrawCanvas_New_Paletted (width, height,
scope_frame->image->Palette, -1); scope_frame->image->Palette, -1);
scope_bg = TFB_DrawImage_New (scope_bg_canvas);
scope_surf_canvas = TFB_DrawCanvas_New_Paletted (width, height, scope_surf_canvas = TFB_DrawCanvas_New_Paletted (width, height,
scope_frame->image->Palette, -1); scope_frame->image->Palette, -1);
}
else
{
scope_bg_canvas = TFB_DrawCanvas_New_ForScreen (width, height,
FALSE);
scope_surf_canvas = TFB_DrawCanvas_New_ForScreen (width, height,
FALSE);
}
scope_bg = TFB_DrawImage_New (scope_bg_canvas);
scope_surf = TFB_DrawImage_New (scope_surf_canvas); scope_surf = TFB_DrawImage_New (scope_surf_canvas);
TFB_DrawImage_Image (scope_frame->image, 0, 0, 0, NULL, scope_bg); TFB_DrawImage_Image (scope_frame->image, 0, 0, 0, NULL, scope_bg);
scope_init = 1; scope_init = 1;
@@ -81,9 +91,9 @@ Oscilloscope (DWORD grab_data)
if (GetSoundData (scope_data)) if (GetSoundData (scope_data))
{ {
int i, r, g, b; int i, r, g, b;
r = scope_surf->Palette[238].r; TFB_DrawCanvas_GetPixel (scope_bg->NormalImg,
g = scope_surf->Palette[238].g; scope_bg->extent.width / 2, scope_bg->extent.height / 2,
b = scope_surf->Palette[238].b; &r, &g, &b);
for (i = 0; i < RADAR_WIDTH - 3; ++i) for (i = 0; i < RADAR_WIDTH - 3; ++i)
TFB_DrawImage_Line (i + 1, scope_data[i], i + 2, TFB_DrawImage_Line (i + 1, scope_data[i], i + 2,
scope_data[i + 1], r, g, b, scope_surf); scope_data[i + 1], r, g, b, scope_surf);