resolving ambiguos symbols

AcademySoftwareFoundation · Apr 17, 2013 · f38a591 · f38a591
1 parent 7dcffff
commit f38a591
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp
@@ -97,7 +97,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
         stringstream ss;
         ss << i;
         string str = ss.str();
-        headers[0].channels().insert(str, Channel(FLOAT));
+        headers[0].channels().insert(str, Channel(Imf::FLOAT));
     }
 
      headers[0].setType(DEEPSCANLINE);
@@ -126,7 +126,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
 
      DeepFrameBuffer frameBuffer;
 
-     frameBuffer.insertSampleCountSlice (Slice (UINT,                    // type // 7
+     frameBuffer.insertSampleCountSlice (Slice (Imf::UINT,                    // type // 7
                                                 (char *) (&sampleCount[0][0]
                                                 - dataWindow.min.x
                                                 - dataWindow.min.y * width),               // base // 8
@@ -135,7 +135,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
 
      for (int i = 0; i < channelCount; i++)
      {
-         PixelType type=FLOAT;
+         PixelType type = Imf::FLOAT;
          stringstream ss;
          ss << i;
          string str = ss.str();
@@ -208,7 +208,7 @@ void readFile(const char filename[])
 
         DeepFrameBuffer frameBuffer;
 
-        frameBuffer.insertSampleCountSlice (Slice (UINT,                    // type // 7
+        frameBuffer.insertSampleCountSlice (Slice (Imf::UINT,                    // type // 7
                                                    (char *) (&localSampleCount[0][0]
                                                    - dataWindow.min.x
                                                    - dataWindow.min.y * width),               // base // 8)
@@ -220,7 +220,7 @@ void readFile(const char filename[])
 
         for (int i = 0; i < channelCount; i++)
         {
-            PixelType type = FLOAT;
+            PixelType type = Imf::FLOAT;
 
             stringstream ss;
             ss << i;
@@ -301,7 +301,7 @@ void readFile(const char filename[])
 
             DeepFrameBuffer frameBuffer;
 
-            frameBuffer.insertSampleCountSlice (Slice (UINT,                    // type // 7
+            frameBuffer.insertSampleCountSlice (Slice (Imf::UINT,                    // type // 7
                                                        (char *) (&localSampleCount[0][0]
                                                        - dataWindow.min.x
                                                        - dataWindow.min.y * width),               // base // 8)
@@ -313,7 +313,7 @@ void readFile(const char filename[])
 
             for (int i = 0; i < channelCount; i++)
             {
-                PixelType type = FLOAT;
+                PixelType type = Imf::FLOAT;
 
                 stringstream ss;
                 ss << i;

diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp
@@ -161,7 +161,7 @@ void generateRandomFile(const char filename[], int channelCount, int parts , Com
         int pointerSize = sizeof (char *);
 
         frameBuffer.insert (str,
-                            DeepSlice (FLOAT,
+                            DeepSlice (Imf::FLOAT,
                                        (char *) (&data[i][0][0] - memOffset),
                                        pointerSize * 1,
                                        pointerSize * width,
@@ -278,7 +278,7 @@ void readFile(const char filename[])
              int pointerSize = sizeof (char *);
 
              frameBuffer.insert (str,
-                                 DeepSlice (FLOAT,
+                                 DeepSlice (Imf::FLOAT,
                                             (char *) (&data[i][0][0] - memOffset),
                                             pointerSize * 1,
                                             pointerSize * width,
@@ -391,7 +391,7 @@ void readFile(const char filename[])
                 int pointerSize = sizeof (char *);
 
                 frameBuffer.insert (str,
-                                    DeepSlice (FLOAT,
+                                    DeepSlice (Imf::FLOAT,
                                                (char *) (&data[i][0][0] - memOffset),
                                                pointerSize * 1,
                                                pointerSize * width,