Skip to content

Commit

Permalink
Use future boost::gil 1.68 IO extensions instead of homegrown hack
Browse files Browse the repository at this point in the history 
Starting with boost 1.68 boost::gil integrates IO support for
grayscale-alpha png images, so prefer their implementation instead of
our hacky gilext code.
  • Loading branch information
@adrianbroher
adrianbroher committed Jul 18, 2018
1 parent a5eae27 commit b489721
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 21 deletions.
10 changes: 10 additions & 0 deletions GG/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,16 @@ if(USE_STATIC_LIBS)
)
endif()

target_compile_definitions(GiGi
PRIVATE

# Starting with boost 1.68 boost::gil integrates support for
# grayscale-alpha png images, so prefer their implementation
# instead of our hacky gilext code.
$<$<VERSION_LESS:${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION},1.68>:GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO>
$<$<VERSION_GREATER:${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION},1.67>:BOOST_GIL_IO_ENABLE_GRAY_ALPHA>
)

target_include_directories(GiGi SYSTEM
PRIVATE
${Boost_INCLUDE_DIRS}
Expand Down
34 changes: 21 additions & 13 deletions GG/src/GUI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@
#include <GG/ZList.h>

#if GG_HAVE_LIBPNG
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-local-typedefs"
# endif
# include "gilext/io/png_io.hpp"
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
# pragma GCC diagnostic pop
# if GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-local-typedefs"
# endif
# include "gilext/io/png_io.hpp"
# include "gilext/io/png_io_v2_compat.hpp"
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
# pragma GCC diagnostic pop
# endif
# else
# include <boost/gil/extension/io/png.hpp>
# endif
#endif

Expand Down Expand Up @@ -132,12 +137,15 @@ namespace {
glPopClientAttrib();

using namespace boost::gil;
png_write_view(filename,
flipped_up_down_view(
interleaved_view(Value(size.x),
Value(size.y),
static_cast<rgba8_pixel_t*>(static_cast<void*>(&bytes[0])),
Value(size.x) * sizeof(rgba8_pixel_t))));
write_view(
filename,
flipped_up_down_view(
interleaved_view(
Value(size.x),
Value(size.y),
static_cast<rgba8_pixel_t*>(static_cast<void*>(&bytes[0])),
Value(size.x) * sizeof(rgba8_pixel_t))),
png_tag());
#endif
}
}
Expand Down
15 changes: 10 additions & 5 deletions GG/src/Texture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
#include <boost/algorithm/string/case_conv.hpp>

#if GG_HAVE_LIBPNG
# include "gilext/io/png_dynamic_io.hpp"
# if GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO
# include "gilext/io/png_dynamic_io.hpp"
# include "gilext/io/png_io_v2_compat.hpp"
# else
# include <boost/gil/extension/io/png.hpp>
# endif
#endif

#include <iostream>
Expand Down Expand Up @@ -241,12 +246,12 @@ void Texture::Load(const boost::filesystem::path& path, bool mipmap/* = false*/)
// formats above.
#if GG_HAVE_LIBPNG
if (extension == ".png")
gil::png_read_image(path, image);
gil::read_image(filename, image, gil::image_read_settings<gil::png_tag>());
else
#endif
#if GG_HAVE_LIBTIFF
if (extension == ".tif" || extension == ".tiff")
gil::tiff_read_image(filename, image);
gil::read_image(filename, image, gil::image_read_settings<gil::tiff_tag>());
else
#endif
throw BadFile("Texture file \"" + filename + "\" does not have a supported file extension");
Expand All @@ -256,14 +261,14 @@ void Texture::Load(const boost::filesystem::path& path, bool mipmap/* = false*/)
#if GG_HAVE_LIBPNG
if (extension == ".png") {
gil::rgba8_image_t rgba_image;
gil::png_read_and_convert_image(path, rgba_image);
gil::read_and_convert_image(filename, rgba_image, gil::image_read_settings<gil::png_tag>());
image.move_in(rgba_image);
}
#endif
#if GG_HAVE_LIBTIFF
if (extension == ".tif" || extension == ".tiff") {
gil::rgba8_image_t rgba_image;
gil::tiff_read_and_convert_image(filename, rgba_image);
gil::read_and_convert_image(filename, rgba_image, gil::image_read_settings<gil::tiff_tag>());
image.move_in(rgba_image);
}
#endif
Expand Down
45 changes: 45 additions & 0 deletions GG/src/gilext/io/png_io_v2_compat.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#ifndef GILEXT_PNG_IO_V2_COMPAT_H
#define GILEXT_PNG_IO_V2_COMPAT_H

namespace boost { namespace gil {

struct png_tag {};

template< typename Tag>
struct image_read_settings {};

template< typename String
, typename Image
, typename FormatTag
>
inline
void read_image( const String& file_name
, Image& image
, const FormatTag& tag
)
{ boost::gil::png_read_image(file_name, image); }

template< typename String
, typename Image
, typename FormatTag
>
inline
void read_and_convert_image( const String& file_name
, Image& image
, const FormatTag& tag
)
{ boost::gil::png_read_and_convert_image(file_name, image); }
} }

template< typename String
, typename View
, typename FormatTag
>
inline
void write_view( const String& file_name
, const View& view
, const FormatTag& tag
)
{ boost::gil::png_write_view( file_name, view); }

#endif
6 changes: 3 additions & 3 deletions msvc2017/GiGi/GiGi.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>NDEBUG;_USRDLL;GIGI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_USRDLL;GIGI_EXPORTS;GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../include/GG;../../../include/;../../../include/GG;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Expand Down Expand Up @@ -202,7 +202,7 @@
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_USRDLL;_DLL;GiGi_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_USRDLL;_DLL;GiGi_EXPORTS;GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../include/;../../../include;../../GG/;../../../include/freetype2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeaderFile>
Expand Down Expand Up @@ -231,7 +231,7 @@
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_USRDLL;_DLL;GiGi_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_USRDLL;_DLL;GiGi_EXPORTS;GIGI_CONFIG_USE_OLD_IMPLEMENTATION_OF_GIL_PNG_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../include/;../../../include;../../GG/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeaderFile>
Expand Down

0 comments on commit b489721

Please sign in to comment.