cleanup

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1426 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 83 insertions, 83 deletions

diff --git a/converter/other/pngtopam.c b/converter/other/pngtopam.c
index d1ccb0d2..6d1ab37e 100644
--- a/converter/other/pngtopam.c
+++ b/converter/other/pngtopam.c
@@ -46,89 +46,6 @@ struct CmdlineInfo {
 };
 
 
-typedef struct {
-/*----------------------------------------------------------------------------
-   A color in a format compatible with the PNG library.
-
-   Note that the PNG library declares types png_color and png_color_16
-   which are similar.
------------------------------------------------------------------------------*/
-    png_uint_16 r;
-    png_uint_16 g;
-    png_uint_16 b;
-} pngcolor;
-
-
-
-static pngcolor
-pngcolorFrom16(png_color_16 const arg) {
-
-    pngcolor retval;
-
-    retval.r = arg.red;
-    retval.g = arg.green;
-    retval.b = arg.blue;
-
-    return retval;
-}
-
-
-
-static pngcolor
-pngcolorFromByte(png_color const arg) {
-
-    pngcolor retval;
-
-    retval.r = arg.red;
-    retval.g = arg.green;
-    retval.b = arg.blue;
-
-    return retval;
-}
-
-
-
-static bool
-pngColorEqual(pngcolor const comparand,
-              pngcolor const comparator) {
-
-    return (comparand.r == comparator.r
-            && comparand.g == comparator.g
-            && comparand.b == comparator.b);
-}
-
-
-
-static png_uint_16
-gammaCorrect(png_uint_16 const v,
-             float       const g,
-             png_uint_16 const maxval) {
-
-    if (g != -1.0)
-        return (png_uint_16)
-            ROUNDU(pow((double) v / maxval, (1.0 / g)) * maxval);
-    else
-        return v;
-}
-
-
-
-static pngcolor
-gammaCorrectColor(pngcolor    const color,
-                  double      const gamma,
-                  png_uint_16 const maxval) {
-
-    pngcolor retval;
-
-    retval.r = gammaCorrect(color.r, gamma, maxval);
-    retval.g = gammaCorrect(color.g, gamma, maxval);
-    retval.b = gammaCorrect(color.b, gamma, maxval);
-
-    return retval;
-}
-
-
-
 static bool verbose;
 
 
@@ -219,6 +136,89 @@ parseCommandLine(int                  argc,
 
 
 
+typedef struct {
+/*----------------------------------------------------------------------------
+   A color in a format compatible with the PNG library.
+
+   Note that the PNG library declares types png_color and png_color_16
+   which are similar.
+-----------------------------------------------------------------------------*/
+    png_uint_16 r;
+    png_uint_16 g;
+    png_uint_16 b;
+} pngcolor;
+
+
+
+static pngcolor
+pngcolorFrom16(png_color_16 const arg) {
+
+    pngcolor retval;
+
+    retval.r = arg.red;
+    retval.g = arg.green;
+    retval.b = arg.blue;
+
+    return retval;
+}
+
+
+
+static pngcolor
+pngcolorFromByte(png_color const arg) {
+
+    pngcolor retval;
+
+    retval.r = arg.red;
+    retval.g = arg.green;
+    retval.b = arg.blue;
+
+    return retval;
+}
+
+
+
+static bool
+pngColorEqual(pngcolor const comparand,
+              pngcolor const comparator) {
+
+    return (comparand.r == comparator.r
+            && comparand.g == comparator.g
+            && comparand.b == comparator.b);
+}
+
+
+
+static png_uint_16
+gammaCorrect(png_uint_16 const v,
+             float       const g,
+             png_uint_16 const maxval) {
+
+    if (g != -1.0)
+        return (png_uint_16)
+            ROUNDU(pow((double) v / maxval, (1.0 / g)) * maxval);
+    else
+        return v;
+}
+
+
+
+static pngcolor
+gammaCorrectColor(pngcolor    const color,
+                  double      const gamma,
+                  png_uint_16 const maxval) {
+
+    pngcolor retval;
+
+    retval.r = gammaCorrect(color.r, gamma, maxval);
+    retval.g = gammaCorrect(color.g, gamma, maxval);
+    retval.b = gammaCorrect(color.b, gamma, maxval);
+
+    return retval;
+}
+
+
+
 static void
 verifyFileIsPng(FILE *   const ifP,
                 size_t * const consumedByteCtP) {