[Commits] [wesnoth/wesnoth] 8dfdc6: add SDL_SavePNG, write files as png if possible, u...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 8dfdc6b185f7d9c5d6166f28dd2693fc64a30a27
      https://github.com/wesnoth/wesnoth/commit/8dfdc6b185f7d9c5d6166f28dd2693fc64a30a27
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/SConscript
    A src/SDL_SavePNG/README.md
    A src/SDL_SavePNG/savepng.cpp
    A src/SDL_SavePNG/savepng.h
    M src/display.cpp
    M src/image.cpp
    M src/image.hpp

  Log Message:
  -----------
  add SDL_SavePNG, write files as png if possible, unless ending .bmp

This commit adds a "minimal interface to lib png to support writing
png files from SDL surfaces", to the codebase. It adds a save_image
function to namespace image, and this checks compiler flags to see
if lib png is available. The function will save as a png if png
support is included and save file name doesn't have bmp extension,
and otherwise it will save as a BMP as usual.

We already had lib png as a dependency to build the tools, just not
the main game. This commit changes cmake and scons but makes the
dependency only optional, changing nothing if lib png is not
available.

See here: https://github.com/driedfruit/SDL_SavePNG


  Commit: 22b7a3932e0832f95da5d8b2ab670014d0c658dc
      https://github.com/wesnoth/wesnoth/commit/22b7a3932e0832f95da5d8b2ab670014d0c658dc
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M CMakeLists.txt
    M SConstruct
    M src/CMakeLists.txt
    M src/SConscript
    A src/SDL_SavePNG/README.md
    A src/SDL_SavePNG/savepng.cpp
    A src/SDL_SavePNG/savepng.h
    M src/display.cpp
    M src/image.cpp
    M src/image.hpp

  Log Message:
  -----------
  Merge branch 'save_png'

Conflicts:
	CMakeLists.txt


  Commit: d4f05fd5aebf7f2e3e169d39a4dc4c9450cf4851
      https://github.com/wesnoth/wesnoth/commit/d4f05fd5aebf7f2e3e169d39a4dc4c9450cf4851
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M src/sound.cpp

  Log Message:
  -----------
  fixup SDL mixer version check

fixes up commit 972ae8d78a318e1dece92bf57a4d77672373c60a


Compare: https://github.com/wesnoth/wesnoth/compare/0442e6514a9e...d4f05fd5aebf