Browse Source

Fixed Android build warnings

Sam Lantinga 1 year ago
parent
commit
efdcfef4b9
2 changed files with 4 additions and 4 deletions
  1. 1 1
      src/cpuinfo/SDL_cpuinfo.c
  2. 3 3
      src/render/SDL_render.c

+ 1 - 1
src/cpuinfo/SDL_cpuinfo.c

@@ -859,7 +859,7 @@ int SDL_GetCPUCacheLineSize(void)
         cacheline_size = c & 0xff;
         cacheline_size = c & 0xff;
     } else {
     } else {
 #if defined(HAVE_SYSCONF) && defined(_SC_LEVEL1_DCACHE_LINESIZE)
 #if defined(HAVE_SYSCONF) && defined(_SC_LEVEL1_DCACHE_LINESIZE)
-        if ((cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE)) > 0) {
+        if ((cacheline_size = (int)sysconf(_SC_LEVEL1_DCACHE_LINESIZE)) > 0) {
             return cacheline_size;
             return cacheline_size;
         } else {
         } else {
             cacheline_size = SDL_CACHELINE_SIZE;
             cacheline_size = SDL_CACHELINE_SIZE;

+ 3 - 3
src/render/SDL_render.c

@@ -1497,7 +1497,7 @@ SDL_Texture *SDL_CreateTexture(SDL_Renderer *renderer, SDL_PixelFormat format, S
 
 
 static int SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, SDL_Surface *surface)
 static int SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, SDL_Surface *surface)
 {
 {
-    int access;
+    SDL_TextureAccess access;
     SDL_bool direct_update;
     SDL_bool direct_update;
     SDL_PixelFormat tex_format;
     SDL_PixelFormat tex_format;
     SDL_PropertiesID surface_props;
     SDL_PropertiesID surface_props;
@@ -1519,8 +1519,8 @@ static int SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, SD
         return -1;
         return -1;
     }
     }
 
 
-    tex_format = SDL_GetNumberProperty(tex_props, SDL_PROP_TEXTURE_FORMAT_NUMBER, 0);
-    access = SDL_GetNumberProperty(tex_props, SDL_PROP_TEXTURE_ACCESS_NUMBER, 0);
+    tex_format = (SDL_PixelFormat)SDL_GetNumberProperty(tex_props, SDL_PROP_TEXTURE_FORMAT_NUMBER, 0);
+    access = (SDL_TextureAccess)SDL_GetNumberProperty(tex_props, SDL_PROP_TEXTURE_ACCESS_NUMBER, 0);
 
 
     if (access != SDL_TEXTUREACCESS_STATIC && access != SDL_TEXTUREACCESS_STREAMING) {
     if (access != SDL_TEXTUREACCESS_STATIC && access != SDL_TEXTUREACCESS_STREAMING) {
         return -1;
         return -1;