Index: /branches/eam_branch_20081124/Ohana/src/delstar/src/parse_time.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/delstar/src/parse_time.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/delstar/src/parse_time.c	(revision 20840)
@@ -31,10 +31,10 @@
   gfits_scan (header, UTKeyword, "%s", 1, line);
   /* remove ':' characters */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
   sscanf (line, "%d %d %d", &hour, &min, &sec);
 
   /* parse mode line */
   uppercase (DateMode);
-  for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
+  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
   if ((Ny != 2) && (Ny != 4)) {
     Shutdown ("error in DATE-MODE format: %s", DateMode);
@@ -43,5 +43,5 @@
   pm = strchr (DateMode, 'M');
   pd = strchr (DateMode, 'D');
-  if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
+  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
     Shutdown ("error in DATE-MODE format: %s", DateMode);
   }
@@ -65,8 +65,8 @@
   gfits_scan (header, DateKeyword, "%s",  1, line);
   /* remove possible separators: ':', '/' '.', '-' */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
-  for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
-  for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
-  for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
+  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
+  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
 
   Nf = 0;
Index: /branches/eam_branch_20081124/Ohana/src/imregister/base/parse_time.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/imregister/base/parse_time.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/imregister/base/parse_time.c	(revision 20840)
@@ -31,10 +31,10 @@
   warn_scan (header, UTKeyword, "%s", 1, line);
   /* remove ':' characters */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
   sscanf (line, "%d %d %d", &hour, &min, &sec);
 
   /* parse mode line */
   uppercase (DateMode);
-  for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
+  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
   if ((Ny != 2) && (Ny != 4)) {
     fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
@@ -44,5 +44,5 @@
   pm = strchr (DateMode, 'M');
   pd = strchr (DateMode, 'D');
-  if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
+  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
     fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
     exit (0);
@@ -70,8 +70,8 @@
   warn_scan (header, DateKeyword, "%s",  1, line);
   /* remove possible separators: ':', '/' '.', '-' */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
-  for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
-  for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
-  for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
+  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
+  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
 
   Nf = 0;
Index: /branches/eam_branch_20081124/Ohana/src/kapa2/src/LoadObject.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/kapa2/src/LoadObject.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/kapa2/src/LoadObject.c	(revision 20840)
@@ -123,5 +123,5 @@
   }
   if (Nbytes_send != Npts_send*sizeof(float)) {
-    fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %d\n", Nbytes_send, Npts_send*sizeof(float));
+    fprintf (stderr, "Kapa Communication error: unexpected data size %d vs %ld\n", Nbytes_send, Npts_send*sizeof(float));
   }
 
Index: /branches/eam_branch_20081124/Ohana/src/kapa2/src/PaintOverlay.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/kapa2/src/PaintOverlay.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/kapa2/src/PaintOverlay.c	(revision 20840)
@@ -5,5 +5,5 @@
   int i;
   int dX, dY, dx, dy;
-  int x, y, Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
+  int Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
   double t, expand, X, Y, pX, pY;
  
Index: /branches/eam_branch_20081124/Ohana/src/libdvo/include/ps1_dev_3_defs.h
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/libdvo/include/ps1_dev_3_defs.h	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/libdvo/include/ps1_dev_3_defs.h	(revision 20840)
@@ -1,2 +1,5 @@
+Image 		       	*Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues);
+Image_PS1_DEV_3  	*ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues);
+
 PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues);
 PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues);
Index: /branches/eam_branch_20081124/Ohana/src/libkapa/src/KiiPicture.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/libkapa/src/KiiPicture.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/libkapa/src/KiiPicture.c	(revision 20840)
@@ -108,9 +108,7 @@
 int KiiNewPicture2D (int fd, KiiImage *image, KapaImageData *data, Coords *coords) {
 
-  int i, j;
-  int Npix, Ncolors, NNcolors, size;
-  float *in, min, max;
-  char *out, *outbuffer;
-  double a1, a2;
+  int j;
+  int Npix, Ncolors, size;
+  float min, max;
 
   Npix = image[0].Nx*image[0].Ny;
Index: /branches/eam_branch_20081124/Ohana/src/mosastro/src/parse_time.c
===================================================================
--- /branches/eam_branch_20081124/Ohana/src/mosastro/src/parse_time.c	(revision 20839)
+++ /branches/eam_branch_20081124/Ohana/src/mosastro/src/parse_time.c	(revision 20840)
@@ -32,10 +32,10 @@
   gfits_scan (header, UTKeyword, "%s", 1, line);
   /* remove ':' characters */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
   sscanf (line, "%d %d %d", &hour, &min, &sec);
 
   /* parse mode line */
   uppercase (DateMode);
-  for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
+  for (Ny = 0, c = strchr (DateMode, 'Y'); c != NULL; c = strchr (c + 1, 'Y'), Ny++);
   if ((Ny != 2) && (Ny != 4)) {
     fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
@@ -45,5 +45,5 @@
   pm = strchr (DateMode, 'M');
   pd = strchr (DateMode, 'D');
-  if ((py == (char *) NULL) || (pm == (char *) NULL) || (pd == (char *) NULL)) {
+  if ((py == NULL) || (pm == NULL) || (pd == NULL)) {
     fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
     exit (1);
@@ -71,8 +71,8 @@
   gfits_scan (header, DateKeyword, "%s",  1, line);
   /* remove possible separators: ':', '/' '.', '-' */
-  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
-  for (c = strchr (line, 0x2f); c != (char *) NULL; c = strchr (line, 0x2f)) { *c = ' '; }
-  for (c = strchr (line, 0x2e); c != (char *) NULL; c = strchr (line, 0x2e)) { *c = ' '; }
-  for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
+  for (c = strchr (line, 0x3a); c != NULL; c = strchr (line, 0x3a)) { *c = ' '; }
+  for (c = strchr (line, 0x2f); c != NULL; c = strchr (line, 0x2f)) { *c = ' '; }
+  for (c = strchr (line, 0x2e); c != NULL; c = strchr (line, 0x2e)) { *c = ' '; }
+  for (c = strchr (line, 0x2d); c != NULL; c = strchr (line, 0x2d)) { *c = ' '; }
 
   Nf = 0;