From ad4a30c58ffb92aa8758190646062db9ef8131de Mon Sep 17 00:00:00 2001
From: David <mayerich@uh.edu>
Date: Sat, 30 May 2015 20:31:52 -0500
Subject: [PATCH] changed grid_data to grid

---
 stim/grids/grid_data.h   |  6 +++---
 stim/grids/image_stack.h | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stim/grids/grid_data.h b/stim/grids/grid_data.h
index 82eef7c..8b29714 100644
--- a/stim/grids/grid_data.h
+++ b/stim/grids/grid_data.h
@@ -1,5 +1,5 @@
-#ifndef STIM_GRID_DATA_CUH
-#define STIM_GRID_DATA_CUH
+#ifndef STIM_GRID_H
+#define STIM_GRID_H
 
 #include <vector>
 #include <string>
@@ -18,7 +18,7 @@ namespace stim{
 	// data can be loaded in the form of images
 	// data can be saved in the form of binary files
 template<typename T, unsigned int D = 1>
-class grid_data{
+class grid{
 
 protected:
 
diff --git a/stim/grids/image_stack.h b/stim/grids/image_stack.h
index de02005..c49bd82 100644
--- a/stim/grids/image_stack.h
+++ b/stim/grids/image_stack.h
@@ -3,22 +3,22 @@
 
 #include "../parser/wildcards.h"
 #include "../parser/filename.h"
-#include "../grids/grid_data.h"
+#include "../grids/grid.h"
 #include "../image/image.h"
 
 namespace stim{
 
 //this creates a class that can be used to load 3D grid data from stacks of images
-//	The class uses a 4D grid_data object, where the first dimension is color
+//	The class uses a 4D grid object, where the first dimension is color
 template<typename T>
-class image_stack : public virtual grid_data<T, 4>{
+class image_stack : public virtual stim::grid<T, 4>{
 
 	enum image_type {stimAuto, stimMono, stimRGB, stimRGBA};
 
 protected:
-	using grid_data<T, 4>::R;
-	using grid_data<T, 4>::ptr;
-	using grid_data<T, 4>::samples;
+	using stim::grid<T, 4>::R;
+	using stim::grid<T, 4>::ptr;
+	using stim::grid<T, 4>::samples;
 
 public:
 
--
libgit2 0.21.4