Author: cazfi
Date: Sun Nov  6 08:11:13 2016
New Revision: 34403

URL: http://svn.gna.org/viewcvs/freeciv?rev=34403&view=rev
Log:
Completely removed outcommented stuff from sdl2-client graphics.c

See patch #7939

Modified:
    trunk/client/gui-sdl2/graphics.c
    trunk/client/gui-sdl2/graphics.h

Modified: trunk/client/gui-sdl2/graphics.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.c?rev=34403&r1=34402&r2=34403&view=diff
==============================================================================
--- trunk/client/gui-sdl2/graphics.c    (original)
+++ trunk/client/gui-sdl2/graphics.c    Sun Nov  6 08:11:13 2016
@@ -304,21 +304,6 @@
     return NULL;
   }
 
-#if 0
-  if (Main.screen) {
-    SDL_Surface *pNew_sur;
-
-    if ((pNew_sur = SDL_ConvertSurfaceFormat(pBuf, SDL_PIXELFORMAT_RGBA4444, 
0)) == NULL) {
-      log_error(_("load_surf: Unable to convert file %s "
-                  "into screen's format!"), pFname);
-    } else {
-      FREESURFACE(pBuf);
-
-      return pNew_sur;
-    }
-  }
-#endif /* 0 */
-
   return pBuf;
 }
 
@@ -424,50 +409,7 @@
 }
 
 /**************************************************************************
-  This is center main application window function
-  currently it work only for X but problem is that such
-  functions will be needed by others enviroments.
-  ( for X it's make by settings "SDL_VIDEO_CENTERED" enviroment )
-**************************************************************************/
-int center_main_window_on_screen(void)
-{
-#if 0
-  SDL_SysWMinfo myinfo;
-
-  SDL_VERSION(&myinfo.version);
-  if (SDL_GetWMInfo(&myinfo) > 0)
-  {
-#ifdef FREECIV_MSWINDOWS
-
-    /* Port ME - Write center window code with WinAPI instructions */
-
-    return 0;
-#else /* FREECIV_MSWINDOWS */
-
-#if 0
-    /* this code is for X and is only example what should be write to other
-       enviroments */
-    Screen *defscr;
-    Display *d = myinfo.info.x11.display;
-
-    myinfo.info.x11.lock_func();
-    defscr = DefaultScreenOfDisplay(d);
-    XMoveWindow(d, myinfo.info.x11.wmwindow,
-               (defscr->width - Main.screen->w) / 2,
-               (defscr->height - Main.screen->h) / 2);
-    myinfo.info.x11.unlock_func();
-#endif /* 0 */
-    return 0;
-#endif /* FREECIV_MSWINDOWS */
-  }
-  return -1;
-#endif /* 0 */
-
-  return 0;
-}
-
-/**************************************************************************
-  get pixel
+  Get pixel
   Return the pixel value at (x, y)
   NOTE: The surface must be locked before calling this!
 **************************************************************************/
@@ -646,53 +588,6 @@
                                     SDL_PIXELFORMAT_ARGB8888,
                                     SDL_TEXTUREACCESS_STREAMING,
                                     iWidth, iHeight);
-
-#if 0
-  /* find best bpp */
-  int iDepth = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
-
-  /*  if screen does exist check if this is mayby
-     exactly the same resolution then return 1 */
-  if (Main.screen) {
-    if (Main.screen->w == iWidth && Main.screen->h == iHeight) {
-      if ((Main.screen->flags & SDL_FULLSCREEN)
-          && (iFlags & SDL_FULLSCREEN)) {
-        return 1;
-      }
-    }
-  }
-
-  /* Check to see if a particular video mode is supported */
-  if ((iDepth = SDL_VideoModeOK(iWidth, iHeight, iDepth, iFlags)) == 0) {
-    log_error(_("No available mode for this resolution : %d x %d %d bpp"),
-              iWidth, iHeight, iDepth);
-
-    log_debug(_("Setting default resolution to : 640 x 480 16 bpp SW"));
-
-    Main.screen = SDL_SetVideoMode(640, 480, 16, SDL_SWSURFACE);
-  } else { /* set video mode */
-    if ((Main.screen = SDL_SetVideoMode(iWidth, iHeight,
-                                        iDepth, iFlags)) == NULL) {
-    log_error(_("Unable to set this resolution: %d x %d %d bpp %s"),
-              iWidth, iHeight, iDepth, SDL_GetError());
-
-    exit(-30);
-  }
-
-  log_debug(_("Setting resolution to: %d x %d %d bpp"),
-            iWidth, iHeight, iDepth);
-  }
-
-  /* Create a dummy surface to be used when sprites are missing, etc.
-   * Various things (such as zoomSurfaceRGBA() don't cope well with a
-   * zero-sized surface, so we use a transparent 1x1 surface. */
-  FREESURFACE(Main.dummy);
-  Main.dummy = create_surf(1, 1, SDL_SWSURFACE);
-
-  FREESURFACE(Main.map);
-  Main.map = SDL_DisplayFormat(Main.screen);
-
-#endif /* 0 */
 
   if (Main.gui) {
     FREESURFACE(Main.gui->surface);
@@ -1474,64 +1369,6 @@
           && (y >= rect.y) && (y < rect.y + rect.h));
 }
 
-/**************************************************************************
-  Most black color is coded like {0,0,0,255} but in sdl if alpha is turned 
-  off and colorkey is set to 0 this black color is transparent.
-  To fix this we change all black {0, 0, 0, 255} to newblack {4, 4, 4, 255}
-  (first collor != 0 in 16 bit coding).
-**************************************************************************/
-bool correct_black(SDL_Surface *pSrc)
-{
-#if 0
-  bool ret = 0;
-  register int x;
-
-  if (pSrc->format->BitsPerPixel == 32 && pSrc->format->Amask) {
-    register Uint32 alpha, *pPixels = (Uint32 *) pSrc->pixels;
-    Uint32 Amask = pSrc->format->Amask;
-    Uint32 black = SDL_MapRGBA(pSrc->format, 0, 0, 0, 255);
-    Uint32 new_black = SDL_MapRGBA(pSrc->format, 4, 4, 4, 255);
-    int end = pSrc->w * pSrc->h;
-
-    /* for 32 bit color coding */
-
-    lock_surf(pSrc);
-
-    for (x = 0; x < end; x++, pPixels++) {
-      if (*pPixels == black) {
-        *pPixels = new_black;
-      } else {
-        if (!ret) {
-          alpha = *pPixels & Amask;
-          if (alpha && (alpha != Amask)) {
-            ret = 1;
-          }
-        }
-      }
-    }
-
-    unlock_surf(pSrc);
-  } else {
-    if (pSrc->format->BitsPerPixel == 8 && pSrc->format->palette) {
-      for (x = 0; x < pSrc->format->palette->ncolors; x++) {
-        if (x != pSrc->format->colorkey
-            && pSrc->format->palette->colors[x].r < 4
-            && pSrc->format->palette->colors[x].g < 4
-            && pSrc->format->palette->colors[x].b < 4) {
-          pSrc->format->palette->colors[x].r = 4;
-          pSrc->format->palette->colors[x].g = 4;
-          pSrc->format->palette->colors[x].b = 4;
-        }
-      }
-    }
-  }
-
-  return ret;
-#endif /* 0 */
-
-  return TRUE;
-}
-
 /* ===================================================================== */
 
 /**************************************************************************

Modified: trunk/client/gui-sdl2/graphics.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.h?rev=34403&r1=34402&r2=34403&view=diff
==============================================================================
--- trunk/client/gui-sdl2/graphics.h    (original)
+++ trunk/client/gui-sdl2/graphics.h    Sun Nov  6 08:11:13 2016
@@ -247,12 +247,8 @@
 
 SDL_Surface *copy_surface(SDL_Surface *src);
 
-bool correct_black(SDL_Surface *pSrc);
-
 int blit_entire_src(SDL_Surface *pSrc,
                     SDL_Surface *pDest, Sint16 iDest_x, Sint16 iDest_y);
-
-int center_main_window_on_screen(void);
 
 Uint32 getpixel(SDL_Surface *pSurface, Sint16 x, Sint16 y);
 Uint32 get_first_pixel(SDL_Surface *pSurface);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to