shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix the setting bug of pre_scale and post_scale

Browse Source
This commit is contained in:
chenli
2011-12-26 15:32:08 +08:00
parent 9e6a4573ac
commit e211a5f0fa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rk29/ipp/rk29-ipp.c
View File

@@ -575,11 +575,11 @@ int ipp_blit(const struct rk29_ipp_req *req)
/*Configure Pre_scale*/
if((IPP_ROT_90 == rotate) || (IPP_ROT_270 == rotate))
{
pre_scale = ((req->dst0.w < req->src0.h) ? 1 : 0)||((req->dst0.h < req->src0.w) ? 1 : 0);
pre_scale = ((req->dst0.w <= req->src0.h/2) ? 1 : 0)||((req->dst0.h <= req->src0.w/2) ? 1 : 0);
}
else //other degree
{
pre_scale = ((req->dst0.w < req->src0.w) ? 1 : 0)||((req->dst0.h < req->src0.h) ? 1 : 0);
pre_scale = ((req->dst0.w <= req->src0.w/2) ? 1 : 0)||((req->dst0.h <= req->src0.h/2) ? 1 : 0);
}
if(pre_scale)
@@ -704,7 +704,7 @@ int ipp_blit(const struct rk29_ipp_req *req)
if((IPP_ROT_90 == rotate) || (IPP_ROT_270 == rotate))
{
if (( (req->src0.h%req->dst0.w)!=0)||( (req->src0.w%req->dst0.h)!= 0)//non-interger down-scaling
||((req->src0.h/req->dst0.w)>8)||((req->src0.h%req->dst0.w)>8) //down-scaling ratio > 8
||((req->src0.h/req->dst0.w)>8)||((req->src0.h/req->dst0.w)>8) //down-scaling ratio > 8
||(req->dst0.w > req->src0.h) ||(req->dst0.h > req->src0.w)) //up-scaling
{
@@ -718,7 +718,7 @@ int ipp_blit(const struct rk29_ipp_req *req)
else //0 180 x-flip y-flip
{
if (( (req->src0.w%req->dst0.w)!=0)||( (req->src0.h%req->dst0.h)!= 0)//non-interger down-scaling
||((req->src0.w/req->dst0.w)>8)||((req->src0.h%req->dst0.h)>8) //down-scaling ratio > 8
||((req->src0.w/req->dst0.w)>8)||((req->src0.h/req->dst0.h)>8) //down-scaling ratio > 8
||(req->dst0.w > req->src0.w) ||(req->dst0.h > req->src0.h)) //up-scaling
{
post_scale = 1;