Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-07 19:37:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use STRETCH_EXTRA_INFO instead of only rotation for StretchBltEx

Browse Source
This commit is contained in:
Vincent Wei
2021-05-04 21:34:15 +08:00
parent d4cadc47e0
commit 6907dba86d
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/newgal.h
View File

@@ -934,7 +934,8 @@ GAL_Surface * GAL_DisplayFormat (GAL_Surface *surface);
GAL_Surface * GAL_DisplayFormatAlpha (GAL_Surface *surface);
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, int rotation, DWORD op);
GAL_Surface *dst, GAL_Rect *dstrect,
const STRETCH_EXTRA_INFO *sei, DWORD ops);
#ifdef _MGSCHEMA_COMPOSITING
extern GAL_Surface* __gal_screen;

21
src/newgal/stretch.c
View File

@@ -404,7 +404,8 @@ static int GAL_StretchBltLegacy (GAL_Surface *src, GAL_Rect *srcrect,
#include <math.h>
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, int rotation, DWORD ops)
GAL_Surface *dst, GAL_Rect *dstrect,
const STRETCH_EXTRA_INFO* sei, DWORD ops)
{
pixman_image_t *src_img = NULL, *dst_img = NULL, *msk_img = NULL;
pixman_op_t op;
@@ -464,7 +465,7 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
{
double fscale_x = srcrect->w * 1.0 / dstrect->w;
double fscale_y = srcrect->h * 1.0 / dstrect->h;
double frotation;
double rotation;
pixman_f_transform_t ftransform;
pixman_transform_t transform;
pixman_region32_t clip_region;
@@ -476,10 +477,17 @@ int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
dst->clip_rect.x, dst->clip_rect.y, dst->clip_rect.w, dst->clip_rect.h);
pixman_f_transform_init_identity (&ftransform);
pixman_f_transform_translate (&ftransform, NULL, -dstrect->x, -dstrect->y);
if (sei && sei->rotation) {
pixman_f_transform_translate (&ftransform, NULL,
-dstrect->x - sei->cx, -dstrect->y - sei->cy);
rotation = (sei->rotation / 360.0 / 64.0) * 2 * M_PI;
pixman_f_transform_rotate (&ftransform, NULL, cos (rotation), sin (rotation));
pixman_f_transform_translate (&ftransform, NULL, sei->cx, sei->cy);
}
else {
pixman_f_transform_translate (&ftransform, NULL, -dstrect->x, -dstrect->y);
}
pixman_f_transform_scale (&ftransform, NULL, fscale_x, fscale_y);
frotation = (rotation / 3600.0) * 2 * M_PI;
pixman_f_transform_rotate (&ftransform, NULL, cos (frotation), sin (frotation));
pixman_f_transform_translate (&ftransform, NULL, srcrect->x, srcrect->y);
//pixman_f_transform_invert (&ftransform, &ftransform);
pixman_transform_from_pixman_f_transform (&transform, &ftransform);
@@ -534,7 +542,8 @@ out:
#else /* defined _MGUSE_PIXMAN */
int GAL_StretchBlt (GAL_Surface *src, GAL_Rect *srcrect,
GAL_Surface *dst, GAL_Rect *dstrect, int rotation, DWORD ops)
GAL_Surface *dst, GAL_Rect *dstrect,
const STRETCH_EXTRA_INFO *sei, DWORD ops)
{
return GAL_StretchBltLegacy (src, srcrect, dst, dstrect, ops);
}

5
src/newgdi/bitmap.c
View File

@@ -1476,7 +1476,8 @@ error_ret:
}
BOOL GUIAPI StretchBltEx (HDC hsdc, int sx, int sy, int sw, int sh,
HDC hddc, int dx, int dy, int dw, int dh, int rotation, DWORD dwRop)
HDC hddc, int dx, int dy, int dw, int dh,
const STRETCH_EXTRA_INFO *sei, DWORD dwRop)
{
PDC psdc, pddc;
RECT srcOutput, dstOutput;
@@ -1542,7 +1543,7 @@ BOOL GUIAPI StretchBltEx (HDC hsdc, int sx, int sy, int sw, int sh,
if (IntersectRect (&eff_rc, &pddc->rc_output, &cliprect->rc)) {
SET_GAL_CLIPRECT (pddc, eff_rc);
GAL_StretchBlt (psdc->surface, &src, pddc->surface, &dst,
rotation, dwRop);
sei, dwRop);
}
cliprect = cliprect->next;