Index: trunk/Ohana/src/opihi/cmd.data/jpeg.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/jpeg.c	(revision 5846)
+++ trunk/Ohana/src/opihi/cmd.data/jpeg.c	(revision 5850)
@@ -3,6 +3,6 @@
 int jpeg (int argc, char **argv) {
 
-  char filename[1024], buffer[20], type[16];
-  int N, Source, Nsource, IsImage;
+  char filename[1024];
+  int N, Source, Nsource, IsImage, IsPNG;
   
   if ((N = get_argument (argc, argv, "--help"))) {
@@ -12,8 +12,8 @@
 
   /* image type */
-  strcpy (type, "PNGF");
+  IsPNG = TRUE;
   if ((N = get_argument (argc, argv, "-ppm"))) {
     remove_argument (N, &argc, argv);
-    strcpy (type, "PPMF");
+    IsPNG = FALSE;
   }
 
@@ -45,17 +45,17 @@
     if (!GetImage (&Source, &Nsource)) return (FALSE);
     if (!filename[0]) strcpy (filename, "Ximage.jpg");
-    strcpy (type, "JPEG");
-    KiiJpeg (Source, filename);
+    KiiJPEG (Source, filename);
   } else {
     if (!GetGraph (NULL, &Source, &Nsource)) return (FALSE);
     if (!filename[0]) strcpy (filename, "Xgraph.png");
-    SendGraphCommand (Source, 4, type);
-    SendGraphCommand (Source, 16, "LEN: %11d", strlen(filename));
-    write (Source, filename, strlen(filename));
-    read (Source, buffer, 4);
+    if (IsPNG) {
+      KapaPNG (Source, filename);
+    } else {
+      KapaPPM (Source, filename);
+    }
   }
   return (TRUE);
 }
 
-/* jpeg -g converts graph to png
+/* jpeg converts graph to png or ppm
    jpeg converts image to jpeg */