github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-09-12 03:12:24 +00:00
Code Releases Activity

Handle images h > w correctly

Browse Source
This commit is contained in:
alpine9000
2016-03-13 09:16:03 +11:00
parent cfb11f92c9
commit 3d12564187
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/resize/resize.c
+29 -4
View File
@@ -156,10 +156,31 @@ main(int argc, char **argv)
int width = image.image->columns;
int height = image.image->rows;
float scale = (float)height/(float)config.height;
int newWidth = width/scale;
float wScale = 1.0;
float hScale = 1.0;
int newWidth = config.width;
int newHeight = config.height;
image.resizeImage=ResizeImage(image.image, newWidth/(config.interlaced?2:1), config.height,
if (width >= height) {
wScale = (float)height/(float)config.height;
newWidth = width/wScale;
} else {
hScale = (float)width/(float)config.width;
newHeight = height/hScale;
if (config.interlaced) {
newHeight *= 2;
newWidth *= 2;
}
}
if (config.verbose) {
printf("wScale = %f\n", wScale);
printf("hScale = %f\n", hScale);
printf("newWidth -> %d\n", newWidth);
printf("newHeight -> %d\n", newHeight);
}
image.resizeImage=ResizeImage(image.image, newWidth/(config.interlaced?2:1), newHeight,
//GaussianFilter,
//BoxFilter,
//TriangleFilter,
@@ -179,11 +200,15 @@ main(int argc, char **argv)
RectangleInfo rect = {
.x = ((newWidth/(config.interlaced?2:1))-config.width)/2,
.y = 0,
.y = (newHeight-config.height)/2,
.width = config.width,
.height = config.height
};
if (config.verbose) {
printf("%ld %ld %ld %ld\n", rect.x, rect.y, rect.width, rect.height);
}
image.croppedImage = CropImage(image.resizeImage, &rect, &exception);
strcpy(image.croppedImage->filename, outputFile);