Browse Source

Avoided a GL symbol redefinition and a warning in MSVC.

tags/2021-05-28
jules 11 years ago
parent
commit
ae291475d6
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      modules/juce_graphics/fonts/juce_Typeface.cpp
  2. +1
    -1
      modules/juce_opengl/native/juce_MissingGLDefinitions.h

+ 4
- 1
modules/juce_graphics/fonts/juce_Typeface.cpp View File

@@ -229,7 +229,7 @@ private:
float median = y[y.size() / 2];
int total = 0;
float total = 0;
int num = 0;
for (int i = 0; i < y.size(); ++i)
@@ -250,6 +250,9 @@ private:
AffineTransform Typeface::getVerticalHintingTransform (float fontSize)
{
if (fontSize < 3.0f || fontSize > 25.0f)
return AffineTransform();
ScopedLock sl (hintingLock);
if (hintingParams == nullptr)


+ 1
- 1
modules/juce_opengl/native/juce_MissingGLDefinitions.h View File

@@ -79,7 +79,7 @@ enum MissingOpenGLDefinitions
GL_STENCIL_ATTACHMENT = 0x8D20,
#endif
#if JUCE_WINDOWS
#if JUCE_WINDOWS && ! defined (GL_TEXTURE0)
GL_OPERAND0_RGB = 0x8590,
GL_OPERAND1_RGB = 0x8591,
GL_OPERAND0_ALPHA = 0x8598,


Loading…
Cancel
Save