Newton, work in progress.

[GPU.git] / WCudaMSE / Student_Cuda_Image / src / cpp / core / 03_Newton / moo / device / NewtonDevice.cu

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/03_Newton/moo/device/NewtonDevice.cu b/WCudaMSE/Student_Cuda_Image/src/cpp/core/03_Newton/moo/device/NewtonDevice.cu
index 536b75b..3399d92 100755 (executable)
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/03_Newton/moo/device/NewtonDevice.cu
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/03_Newton/moo/device/NewtonDevice.cu
@@ -1,4 +1,6 @@
 #include <iostream>\r
+#include <stdio.h>\r
+using namespace std;\r
 \r
 #include "Indice2D.h"\r
 #include "IndiceTools.h"\r
@@ -8,9 +10,6 @@
 \r
 #include "NewtonMath.h"\r
 \r
-using std::cout;\r
-using std::endl;\r
-\r
 __global__ void newton(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMath)\r
     {\r
     const int TID = Indice2D::tid();\r
@@ -20,7 +19,7 @@ __global__ void newton(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMa
     NewtonMath newtonMath;\r
 \r
     uchar4 color;\r
-    color.z = 255; // Par défaut, l'image est opaque.\r
+    color.w = 255; // Par défaut, l'image est opaque.\r
 \r
     double x, y;\r
     int pixelI, pixelJ;\r
@@ -30,8 +29,8 @@ __global__ void newton(uchar4* ptrDevPixels, int w, int h, DomaineMath domaineMa
         {\r
         IndiceTools::toIJ(s, w, &pixelI, &pixelJ); // update (pixelI, pixelJ)\r
 \r
-        // (i,j) domaine ecran\r
-        // (x,y) domaine math\r
+        // (i,j) domaine écran.\r
+        // (x,y) domaine math.\r
         domaineMath.toXY(pixelI, pixelJ, &x, &y); //  (i,j) -> (x,y)\r
 \r
         newtonMath.colorXY(&color, x, y);\r