this is the right max_dimension

liuliu · liuliu · commit c10142d1d391 · 2014-03-12T03:23:01.000-04:00
diff --git a/serve/bbf.c b/serve/bbf.c
@@ -167,7 +167,7 @@ int uri_bbf_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 	ccv_dense_matrix_t* resize = 0;
 	if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension || image->cols > parser->params.max_dimension))
 	{
-		ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
+		ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
 		ccv_matrix_free(image);
 	} else
 		resize = image;
diff --git a/serve/dpm.c b/serve/dpm.c
@@ -179,7 +179,7 @@ int uri_dpm_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 	ccv_dense_matrix_t* resize = 0;
 	if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension || image->cols > parser->params.max_dimension))
 	{
-		ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
+		ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
 		ccv_matrix_free(image);
 	} else
 		resize = image;
diff --git a/serve/icf.c b/serve/icf.c
@@ -167,7 +167,7 @@ int uri_icf_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 	ccv_dense_matrix_t* resize = 0;
 	if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension || image->cols > parser->params.max_dimension))
 	{
-		ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
+		ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
 		ccv_matrix_free(image);
 	} else
 		resize = image;
diff --git a/serve/swt.c b/serve/swt.c
@@ -228,7 +228,7 @@ int uri_swt_detect_words(const void* context, const void* parsed, ebb_buf* buf)
 	ccv_dense_matrix_t* resize = 0;
 	if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension || image->cols > parser->params.max_dimension))
 	{
-		ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
+		ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);
 		ccv_matrix_free(image);
 	} else
 		resize = image;

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ int uri_bbf_detect_objects(const void* context, const void* parsed, ebb_buf* buf`
`167`	`167`	`ccv_dense_matrix_t* resize = 0;`
`168`	`168`	`if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension \|\| image->cols > parser->params.max_dimension))`
`169`	`169`	`{`
`170`		`- ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
	`170`	`+ ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
`171`	`171`	`ccv_matrix_free(image);`
`172`	`172`	`} else`
`173`	`173`	`resize = image;`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ int uri_dpm_detect_objects(const void* context, const void* parsed, ebb_buf* buf`
`179`	`179`	`ccv_dense_matrix_t* resize = 0;`
`180`	`180`	`if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension \|\| image->cols > parser->params.max_dimension))`
`181`	`181`	`{`
`182`		`- ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
	`182`	`+ ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
`183`	`183`	`ccv_matrix_free(image);`
`184`	`184`	`} else`
`185`	`185`	`resize = image;`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ int uri_icf_detect_objects(const void* context, const void* parsed, ebb_buf* buf`
`167`	`167`	`ccv_dense_matrix_t* resize = 0;`
`168`	`168`	`if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension \|\| image->cols > parser->params.max_dimension))`
`169`	`169`	`{`
`170`		`- ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
	`170`	`+ ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
`171`	`171`	`ccv_matrix_free(image);`
`172`	`172`	`} else`
`173`	`173`	`resize = image;`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ int uri_swt_detect_words(const void* context, const void* parsed, ebb_buf* buf)`
`228`	`228`	`ccv_dense_matrix_t* resize = 0;`
`229`	`229`	`if (parser->params.max_dimension > 0 && (image->rows > parser->params.max_dimension \|\| image->cols > parser->params.max_dimension))`
`230`	`230`	`{`
`231`		`- ccv_resample(image, &resize, 0, ccv_max(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_max(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
	`231`	`+ ccv_resample(image, &resize, 0, ccv_min(parser->params.max_dimension, (int)(image->rows * (float)parser->params.max_dimension / image->cols + 0.5)), ccv_min(parser->params.max_dimension, (int)(image->cols * (float)parser->params.max_dimension / image->rows + 0.5)), CCV_INTER_AREA);`
`232`	`232`	`ccv_matrix_free(image);`
`233`	`233`	`} else`
`234`	`234`	`resize = image;`