Merge pull request #5961 from AtariDreams/urgent

Fix swapped arguments
apple · Sep 15, 2021 · e2d7226 · e2d7226
2 parents a3053a0 + 7a767e0
commit e2d7226
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);