Bläddra i källkod

fix compilation error

David Rose 22 år sedan
förälder
incheckning
6b909a2d2c
2 ändrade filer med 10 tillägg och 10 borttagningar
  1. 8 8
      panda/src/pnmimage/pnmImageHeader.I
  2. 2 2
      panda/src/pnmimage/pnmImageHeader.h

+ 8 - 8
panda/src/pnmimage/pnmImageHeader.I

@@ -240,10 +240,10 @@ record_color(PNMImageHeader::Histogram &hist,
 //  Description: 
 ////////////////////////////////////////////////////////////////////
 INLINE PNMImageHeader::PixelSpec::
-PixelSpec(xelval gray) :
-  _red(gray),
-  _green(gray),
-  _blue(gray),
+PixelSpec(xelval gray_value) :
+  _red(gray_value),
+  _green(gray_value),
+  _blue(gray_value),
   _alpha(0)
 {
 }
@@ -254,10 +254,10 @@ PixelSpec(xelval gray) :
 //  Description: 
 ////////////////////////////////////////////////////////////////////
 INLINE PNMImageHeader::PixelSpec::
-PixelSpec(xelval gray, xelval alpha) :
-  _red(gray),
-  _green(gray),
-  _blue(gray),
+PixelSpec(xelval gray_value, xelval alpha) :
+  _red(gray_value),
+  _green(gray_value),
+  _blue(gray_value),
   _alpha(alpha)
 {
 }

+ 2 - 2
panda/src/pnmimage/pnmImageHeader.h

@@ -101,8 +101,8 @@ public:
   // for fiddly reasons.
   class PixelSpec {
   public:
-    INLINE PixelSpec(xelval gray);
-    INLINE PixelSpec(xelval gray, xelval alpha);
+    INLINE PixelSpec(xelval gray_value);
+    INLINE PixelSpec(xelval gray_value, xelval alpha);
     INLINE PixelSpec(xelval red, xelval green, xelval blue);
     INLINE PixelSpec(xelval red, xelval green, xelval blue, xelval alpha);
     INLINE PixelSpec(const PixelSpec &copy);