equal
deleted
inserted
replaced
1054 h -= c->baseh; |
1054 h -= c->baseh; |
1055 } |
1055 } |
1056 |
1056 |
1057 /* adjust for aspect limits */ |
1057 /* adjust for aspect limits */ |
1058 if(c->mina > 0 && c->maxa > 0) { |
1058 if(c->mina > 0 && c->maxa > 0) { |
1059 if(c->maxa < (float)(w / h)) |
1059 if(c->maxa < (float)w / h) |
1060 w = h * c->maxa; |
1060 w = h * c->maxa; |
1061 else if(c->mina < (float)(h / w)) |
1061 else if(c->mina < (float)h / w) |
1062 h = w * c->mina; |
1062 h = w * c->mina; |
1063 } |
1063 } |
1064 |
1064 |
1065 if(baseismin) { /* increment calculation requires this */ |
1065 if(baseismin) { /* increment calculation requires this */ |
1066 w -= c->basew; |
1066 w -= c->basew; |