Browse Source

Merge branch 'master' into cmake

Sam Edwards 7 years ago
parent
commit
e28d8353f4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      panda/src/osxdisplay/osxGraphicsStateGuardian.h

+ 1 - 1
panda/src/osxdisplay/osxGraphicsStateGuardian.h

@@ -64,7 +64,7 @@ private:
   CGGammaValue _gOriginalRedTable[ 256 ];
   CGGammaValue _gOriginalRedTable[ 256 ];
   CGGammaValue _gOriginalGreenTable[ 256 ];
   CGGammaValue _gOriginalGreenTable[ 256 ];
   CGGammaValue _gOriginalBlueTable[ 256 ];
   CGGammaValue _gOriginalBlueTable[ 256 ];
-  CGTableCount _sampleCount;
+  uint32_t _sampleCount;
   CGDisplayErr _cgErr;
   CGDisplayErr _cgErr;
 
 
 public:
 public: