Ctor now explicit, has const argument

halide · May 17, 2016 · 8424a29 · 8424a29
1 parent 818323b
commit 8424a29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/generator/image_from_array_aottest.cpp b/test/generator/image_from_array_aottest.cpp
@@ -152,7 +152,7 @@ void verify_image_construction_from_array(Array &vals) {
         n *= dimSizes[i];
     }
     T const *reference = first_of_array(vals);
-    T  *under_test = img.data();
+    T const *under_test = img.data();
     for (int i = 0; i < n; ++i) {
         if (under_test[i] == reference[i])
             continue;

diff --git a/tools/halide_image.h b/tools/halide_image.h
@@ -174,10 +174,11 @@ class Image {
     }
 
     // Initialize the Image from a statically sized array.
-    // Because of the scalar overload of dimension_sizes, this will only work if Array
+    // The data will be copied to internal storage.
+    // Because of the scalar overload of dimension_sizes, this will only work if vals
     // is T or T const of one or more dimensions.
-    template< typename Array, size_t N >
-    Image(Array (&vals)[N]) {
+    template<typename Array, size_t N>
+    explicit Image(Array const (&vals)[N]) {
         std::vector<int> dimSizes(dimension_sizes(vals));
         size_t dims = dimSizes.size();
         assert(dims <= 4);