Add gamma support to ply-image.

src/ply-image.c

 /* ply-image.c - png file loader
  *
  * Copyright (C) 2006, 2007 Red Hat, Inc.
  * Copyright (C) 2003 University of Southern California
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
@@ skipping 433 matching lines @@
   if (!ply_image_load (image))
     {
       exit_code = errno;
       perror (path);
       exit (exit_code);
     }
   return image;
 }
 
 #include "ply-frame-buffer.h"
+#include "ply-gamma.h"
 
 #include <math.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <values.h>
 
 #include <linux/kd.h>
 
@@ skipping 46 matching lines @@
       return 0;
     }
   return timespec_to_nsec(ts);
 }
 
 
 int usage(void)
 {
   fprintf(stderr,
           "usage: ply-image --clear\n"
           "       ply-image <background> [<x-offset> <y-offset> "

[Daniel Erat, 2011/04/19 20:13:36]

forgot to mention: add something about --gamma here

           "<frame-1> ... <frame-n>]\n");
   exit(1);
 }
 
 
 int
 main (int    argc,
       char **argv)
 {
   int exit_code = 0;
   int clear = 0;
+  int gamma = 0;
   int help = 0;
   ply_frame_buffer_t *buffer;
   int i;
   int xoff, yoff;
   char *endptr;
 
   // hide_cursor ();
 
   /*
    * Ad-hoc arg parsing, to keep the program small.
    */
 
   if (argc > 1)
     {
       clear = strcasecmp (argv[1], "--clear") == 0;
+      gamma = strcasecmp (argv[1], "--gamma") == 0;
       help = strcasecmp (argv[1], "--help") == 0 ||
         strcasecmp (argv[1], "-h") == 0;
     }
 
-  if (help || argc == 1 || argc == 3 || argc == 4)
+  if (help)
     {
       usage();
     }
 
   buffer = ply_frame_buffer_new (NULL);
 
   if (!ply_frame_buffer_open (buffer))
     {
       exit_code = errno;
       perror ("could not open framebuffer");
       return exit_code;
     }
 
   if (clear)
     {
       ply_frame_buffer_clear (buffer);
     }
   else
     {
+      int num_gamma_args = 0;
+      if (gamma)
+        {
+          if (argc < 6)
+            usage();
+          ply_gamma_set(argv[2]);
+          argv += 2;
+          argc -= 2;
+        }
+      else
+        if (argc < 4)
+          usage();
+
       /*
        * Display main image.
        */
       ply_frame_buffer_show_file_at_xy (buffer, argv[1], 0, 0);
 
       if (argc >= 4)
         {
           /*
            * Animate frames.
            */
@@ skipping 51 matching lines @@
             }
         }
     }
 
   // Skip these to save time.
   // ply_frame_buffer_close (buffer);
   // ply_frame_buffer_free (buffer);
 
   return exit_code;
 }