Addressed review comments

Signed-off-by: Megha S <[email protected]>

website/ReadingAndWritingImageFiles.rst

@@ -9,7 +9,7 @@ Document Purpose and Audience
 =============================
 
 This document shows how to write C++ code that reads and writes OpenEXR
-3.0 image files.
+2.0 image files.
 
 The text assumes that the reader is familiar with OpenEXR terms like
 “channel”, “attribute”, “data window” or “deep data”. For an explanation
@@ -126,6 +126,9 @@ Writing a simple RGBA image file is fairly straightforward:
 .. literalinclude:: src/writeRgba1.cpp
    :language: c++
    :linenos:
+   :dedent:
+   :start-after: [begin writeRgba1]
+   :end-before: [end writeRgba1]
 
 Construction of an RgbaOutputFile object, on line 4, creates an OpenEXR header,
 sets the header's attributes, opens the file with the specified name, and stores
@@ -189,12 +192,12 @@ to get right than with error return values. For instance, a program that
 calls our ``writeRgba1()`` function can handle all possible error
 conditions with a single try/catch block:
 
-.. literalinclude:: src/tryCatchExample.cpp
+.. literalinclude:: src/writeRgba1.cpp
    :language: c++
    :linenos:
    :dedent:
-   :start-after: [begin]
-   :end-before: [end]
+   :start-after: [begin tryCatchExample]
+   :end-before: [end tryCatchExample]
 
 Writing a Cropped RGBA Image
 ----------------------------
@@ -1024,6 +1027,8 @@ tiles we want to read.
 
 .. literalinclude:: src/readTiled1.cpp
    :language: c++
+   :linenos:
+   :dedent:
    :start-after: [begin readTiled1]
    :end-before: [end readTiled1]
 

website/src/all.cpp

@@ -118,11 +118,6 @@ void structDefinitions()
     #include "structDefinitions.cpp"
 }
 
-void tryCatchWriteRgba1()
-{
-    #include "tryCatchExample.cpp"
-}
-
 void multithreading()
 {
     #include "multithreading.cpp"

website/src/compression.cpp

@@ -1,5 +1,5 @@
 
-int width, height;
+int width=1; int height=1;
 // [begin setCompression]
 Header header (width, height);
 header.channels().insert ("G", Channel (HALF));

website/src/envmap.cpp

@@ -1,5 +1,5 @@
 
-char fileName[100];
+char fileName[] = "";
 // [begin hasEnvmap]
 RgbaInputFile file (fileName);
 

website/src/multithreading.cpp

@@ -1,4 +1,4 @@
-char fileName[100];
+char fileName[] = "";
 // [begin main thread create]
 // main, before application threads are created:
 

website/src/previewImageExamples.cpp

@@ -28,7 +28,7 @@ unsigned char
 gamma (float x)
 {
     x = pow (5.5555f * max (0.f, x), 0.4545f) * 84.66f;
-    return (unsigned char) clamp (x, 0.f, 255.f);
+    return (unsigned char) std::clamp (x, 0.f, 255.f);
 }
 // [end gamma]
 
@@ -60,7 +60,7 @@ makePreviewImage (
             outPixel.r = gamma (inPixel.r);
             outPixel.g = gamma (inPixel.g);
             outPixel.b = gamma (inPixel.b);
-            outPixel.a = static_cast<int> (clamp (inPixel.a * 255.f, 0.f, 255.f) + 0.5f);
+            outPixel.a = static_cast<int> (std::clamp (inPixel.a * 255.f, 0.f, 255.f) + 0.5f);
         }
     }
 }

website/src/writeRgba1.cpp

@@ -1,7 +1,23 @@
+// [begin writeRgba1]
 void
 writeRgba1 (const char fileName[], const Rgba* pixels, int width, int height)
 {
     RgbaOutputFile file (fileName, width, height, WRITE_RGBA); // 1
     file.setFrameBuffer (pixels, 1, width);                    // 2
     file.writePixels (height);                                 // 3
 }
+// [end writeRgba1]
+
+void
+tryCatchExample (const char fileName[], const Rgba* pixels, int width, int height) {
+    // [begin tryCatchExample]
+    try
+    {
+        writeRgba1 (fileName, pixels, width, height);
+    }
+    catch (const std::exception &exc)
+    {
+        std::cerr << exc.what() << std::endl;
+    }
+    // [end tryCatchExample]
+}

website/src/writeRgbaWithPreview2.cpp

@@ -31,7 +31,7 @@ writeRgbaWithPreview2 (const char fileName[], int width, int height)
                 outPixel.r = gamma (inPixel.r);
                 outPixel.g = gamma (inPixel.g);
                 outPixel.b = gamma (inPixel.b);
-                outPixel.a = int (clamp (inPixel.a * 255.f, 0.f, 255.f) + 0.5f);
+                outPixel.a = int (std::clamp (inPixel.a * 255.f, 0.f, 255.f) + 0.5f);
             }
         }
     }