From: Alfonso Gregory <83477269+AtariDreams@users.noreply.github.com>
Date: Wed, 15 Sep 2021 17:29:47 +0000 (-0400)
Subject: Fix swapped arguments
X-Git-Tag: v2.4b1~61^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F247%2Fhead;p=thirdparty%2Fcups.git

Fix swapped arguments
---

diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index b28c4724ff..d1e942662d 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 304649174a..385f456413 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);