Browse Source

Merge branch 'master' of https://github.com/raysan5/raylib

pull/2605/head
Ray 3 years ago
parent
commit
f596815973
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      examples/core/core_window_should_close.c
  2. +1
    -1
      examples/textures/textures_mouse_painting.c
  3. +1
    -1
      src/rtextures.c

+ 2
- 2
examples/core/core_window_should_close.c View File

@ -38,7 +38,7 @@ int main()
{
// Update
//----------------------------------------------------------------------------------
// Detect if X-button or KEY_ESCAPE have been presssed to close window
// Detect if X-button or KEY_ESCAPE have been pressed to close window
if (WindowShouldClose() || IsKeyPressed(KEY_ESCAPE)) exitWindowRequested = true;
if (exitWindowRequested)
@ -74,4 +74,4 @@ int main()
//--------------------------------------------------------------------------------------
return 0;
}
}

+ 1
- 1
examples/textures/textures_mouse_painting.c View File

@ -29,7 +29,7 @@ int main(void)
InitWindow(screenWidth, screenHeight, "raylib [textures] example - mouse painting");
// Colours to choose from
// Colors to choose from
Color colors[MAX_COLORS_COUNT] = {
RAYWHITE, YELLOW, GOLD, ORANGE, PINK, RED, MAROON, GREEN, LIME, DARKGREEN,
SKYBLUE, BLUE, DARKBLUE, PURPLE, VIOLET, DARKPURPLE, BEIGE, BROWN, DARKBROWN,

+ 1
- 1
src/rtextures.c View File

@ -4574,7 +4574,7 @@ static Image LoadPVR(const unsigned char *fileData, unsigned int fileSize)
unsigned int flags;
unsigned char channels[4]; // pixelFormat high part
unsigned char channelDepth[4]; // pixelFormat low part
unsigned int colourSpace;
unsigned int colorSpace;
unsigned int channelType;
unsigned int height;
unsigned int width;

Loading…
Cancel
Save