efcac2932d
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/cups-filters.git#12bd6655362f7e0f8790c34a208d10ca6333f99e
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff --git a/cupsfilters/ppdgenerator.h b/cupsfilters/ppdgenerator.h
|
|
index 050c3201..027b9752 100644
|
|
--- a/cupsfilters/ppdgenerator.h
|
|
+++ b/cupsfilters/ppdgenerator.h
|
|
@@ -73,6 +73,7 @@ int compare_resolutions(void *resolution_a, void *resolution_b,
|
|
void *user_data);
|
|
void free_resolution(void *resolution, void *user_data);
|
|
res_t * ippResolutionToRes(ipp_attribute_t *attr, int index);
|
|
+res_t * resolutionNew(int x, int y);
|
|
cups_array_t * resolutionArrayNew();
|
|
cups_array_t* generate_sizes(ipp_t *response,
|
|
ipp_attribute_t **defattr,
|
|
diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
|
|
index f47b8115..89c403fc 100644
|
|
--- a/utils/cups-browsed.c
|
|
+++ b/utils/cups-browsed.c
|
|
@@ -6535,12 +6535,14 @@ on_job_state (CupsNotifier *object,
|
|
min_res->x = res->x;
|
|
min_res->y = res->y;
|
|
} else {
|
|
- if(compare_resolutions((void *)res,(void *)max_res,NULL) > 0)
|
|
+ if(compare_resolutions((void *)res,(void *)max_res,NULL) > 0) {
|
|
max_res->x = res->x;
|
|
max_res->y = res->y;
|
|
- if(compare_resolutions((void *)res,(void *)min_res,NULL) < 0)
|
|
+ }
|
|
+ if(compare_resolutions((void *)res,(void *)min_res,NULL) < 0) {
|
|
min_res->x = res->x;
|
|
min_res->y = res->y;
|
|
+ }
|
|
}
|
|
free_resolution(res, NULL);
|
|
res = NULL;
|