From 8292ea5b00004bd7c677c88a2a2b58549d89a6ec Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 2 Apr 2015 14:06:11 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13368
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/dump_image.cpp | 5 ++++-
 src/image.cpp      | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/dump_image.cpp b/src/dump_image.cpp
index ac5ba9534b..6939bc9d5c 100644
--- a/src/dump_image.cpp
+++ b/src/dump_image.cpp
@@ -1047,8 +1047,11 @@ int DumpImage::modify_param(int narg, char **arg)
   if (strcmp(arg[0],"amap") == 0) {
     if (narg < 6) error->all(FLERR,"Illegal dump_modify command");
     if (strlen(arg[3]) != 2) error->all(FLERR,"Illegal dump_modify command");
-    int factor = 2;
+    int factor;
     if (arg[3][0] == 's') factor = 1;
+    else if (arg[3][0] == 'c') factor = 2;
+    else if (arg[3][0] == 'd') factor = 3;
+    else error->all(FLERR,"Illegal dump_modify command");
     int nentry = force->inumeric(FLERR,arg[5]);
     if (nentry < 1) error->all(FLERR,"Illegal dump_modify command");
     int n = 6 + factor*nentry;
diff --git a/src/image.cpp b/src/image.cpp
index df644e0428..ab6824d7fb 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -1756,14 +1756,14 @@ int ColorMap::reset(int narg, char **arg)
       if (!islower(arg[n][0])) {
         mentry[i].lo = NUMERIC;
         mentry[i].lvalue = force->numeric(FLERR,arg[n]);
-      } else if (strcmp(arg[n],"min") == 0) mentry[i].single = MINVALUE;
-      else if (strcmp(arg[n],"max") == 0) mentry[i].single = MAXVALUE;
+      } else if (strcmp(arg[n],"min") == 0) mentry[i].lo = MINVALUE;
+      else if (strcmp(arg[n],"max") == 0) mentry[i].lo = MAXVALUE;
       else return 1;
       if (!islower(arg[n+1][0])) {
         mentry[i].hi = NUMERIC;
         mentry[i].hvalue = force->numeric(FLERR,arg[n+1]);
-      } else if (strcmp(arg[n+1],"min") == 0) mentry[i].single = MINVALUE;
-      else if (strcmp(arg[n+1],"max") == 0) mentry[i].single = MAXVALUE;
+      } else if (strcmp(arg[n+1],"min") == 0) mentry[i].hi = MINVALUE;
+      else if (strcmp(arg[n+1],"max") == 0) mentry[i].hi = MAXVALUE;
       else return 1;
       mentry[i].color = image->color2rgb(arg[n+2]);
       n += 3;