浏览代码

small adjustments

Nicolas Winkler 5 年之前
父节点
当前提交
3114570269

+ 1 - 1
libalmond/include/MandelVideoGenerator.h

@@ -29,7 +29,7 @@ struct ExportVideoInfo
 
 struct MandelVideoProgressInfo
 {
-    int framesExported;
+    int64_t framesExported;
 };
 
 

+ 3 - 3
libmandel/include/Generators.h

@@ -117,7 +117,7 @@ protected:
     Precision type;
     CpuExtension extension;
 public:
-    MandelGenerator();
+    MandelGenerator(void);
     inline MandelGenerator(Precision type) :
         precision{ mnd::getPrecision(type) },
         type{ type },
@@ -142,8 +142,8 @@ public:
     virtual ~MandelGenerator(void);
 
 
-    MandelGenerator(const MandelGenerator&) = delete;
-    MandelGenerator& operator=(const MandelGenerator&) = delete;
+    MandelGenerator(const MandelGenerator&) = default;
+    MandelGenerator& operator=(const MandelGenerator&) = default;
 
     MandelGenerator(MandelGenerator&&) = default;
     MandelGenerator& operator=(MandelGenerator&&) = default;

+ 1 - 2
libmandel/src/IterationGenerator.cpp

@@ -47,8 +47,7 @@ void NaiveGenerator::generate(const mnd::MandelInfo& info, float* data)
 #endif
     for (long j = 0; j < info.bHeight; j++) {
         T y = viewy + T(double(j)) * hpp;
-        long i = 0;
-        for (i; i < info.bWidth; i++) {
+        for (long i = 0; i < info.bWidth; i++) {
             T x = viewx + T(double(i)) * wpp;
 
             T cx = x;

+ 1 - 2
libmandel/src/NaiveIRGenerator.cpp

@@ -217,8 +217,7 @@ void NaiveIRGenerator<T>::generate(const mnd::MandelInfo& info, float* data)
 #endif
     for (long j = 0; j < info.bHeight; j++) {
         T y = viewy + T(double(j)) * hpp;
-        long i = 0;
-        for (i; i < info.bWidth; i++) {
+        for (long i = 0; i < info.bWidth; i++) {
             T x = viewx + T(double(i)) * wpp;
 
             es.prepare(0, 0, x, y);