Changeset 42437

Timestamp:

Mar 24, 2023, 9:47:03 AM (3 years ago)

Author:

eugene

Message:

attempt to load colormap files from the installed directory

Location:

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src

Files:

• FindColormap.c.in (modified) (2 diffs)
• SetColormap.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src/FindColormap.c.in

@@ -36 +36 @@
   }
 
-  /* check permission to exec file */
+  /* check permission to read file */
   status = stat (name, &filestat);
   if (status == 0) { /* file exists, are permissions OK? */
@@ -43 +43 @@
         (                            (filestat.st_mode & S_IROTH))) {
       return (TRUE);
-    } else {
-      return (FALSE);
-    }
+    } 
   }
+  return (FALSE);
 }
 

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src/SetColormap.c

@@ -216 +216 @@
   KapaColorMapMode mode = KAPA_CM_STATIC;
 
+  // we should already have handled the static colormaps by this point
   char *basename = ParseColormapName (graphic->colormapName, &mode);
   if (mode == KAPA_CM_STATIC) {
-    fprintf (stderr, "unknown static colormap name %s\n", &graphic->colormapName);
+    fprintf (stderr, "unknown static colormap name %s\n", graphic->colormapName);
     free (basename);
     return FALSE;
@@ -338 +339 @@
   return (TRUE);
 }
-