diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2021-09-15 15:29:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 15:29:37 -0400 |
| commit | e2d722688683de583dc88aa5283e800fbf0ceba9 (patch) | |
| tree | 575da10d80d4a8977a1671112218b6a00abfc91b | |
| parent | a3053a003891348937fc357f1528acb80441bc28 (diff) | |
| parent | 7a767e0b3ea685f6c0b0beac97c8ae7060dd9595 (diff) | |
| download | cups-e2d722688683de583dc88aa5283e800fbf0ceba9.tar.gz | |
Merge pull request #5961 from AtariDreams/urgent
Fix swapped arguments
| -rw-r--r-- | ppdc/ppdc-source.cxx | 4 | ||||
| -rw-r--r-- | ppdc/ppdc.cxx | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index a42449765..aec291314 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -537,7 +537,7 @@ ppdcSource::get_color_profile( for (i = 0; i < 9; i ++) m[i] = get_float(fp); - return (new ppdcProfile(resolution, media_type, g, d, m)); + return (new ppdcProfile(resolution, media_type, d, g, m)); } @@ -1880,7 +1880,7 @@ ppdcSource::get_simple_profile(ppdcFile *fp) } // Return the new profile... - return (new ppdcProfile(resolution, media_type, g, kd, m)); + return (new ppdcProfile(resolution, media_type, kd, g, m)); } diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 304649174..385f45641 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -229,7 +229,6 @@ main(int argc, // I - Number of command-line arguments default : // Unknown usage(); - break; } } else @@ -393,7 +392,7 @@ main(int argc, // I - Number of command-line arguments return (1); } - if (templocales != locales) + if (templocales && templocales != locales) templocales->release(); cupsFileClose(fp); |