Changeset 981


Ignore:
Timestamp:
Sep 25, 2011, 12:21:54 AM (8 years ago)
Author:
sam
Message:

image: add a GDI+ loader.

Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r961 r981  
    8181            fi
    8282            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
     83            LDFLAGS="$LDFLAGS -L$PWD/contrib/gdiplus/lib"
    8384            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
    8485            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
     
    122123            ;;
    123124        windows-i386|windows-amd64)
     125            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gdiplus/include"
    124126            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
    125127            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
  • trunk/configure.ac

    r960 r981  
    264264
    265265
     266dnl Use Windows GDI+?
     267ac_cv_my_have_gdiplus="no"
     268AC_LANG_PUSH(C++)
     269AC_CHECK_HEADERS(Gdiplus.h,
     270 [ac_cv_my_have_gdiplus="yes"
     271  LOL_LIBS="${LOL_LIBS} -lgdiplus"],
     272 [ac_cv_my_have_gdiplus="no"],
     273 [#include <algorithm>
     274  using std::min;
     275  using std::max;
     276  #include <windows.h>])
     277AC_LANG_POP(C++)
     278if test "${ac_cv_my_have_gdiplus}" != "no"; then
     279  AC_DEFINE(USE_GDIPLUS, 1, Define to 1 to use GDI+)
     280fi
     281AM_CONDITIONAL(USE_GDIPLUS, test "${ac_cv_my_have_gdiplus}" = "yes")
     282
     283
    266284dnl Use libcaca? (required for font generation)
    267285ac_cv_my_have_caca="no"
  • trunk/contrib/gdiplus/include/GdiplusMetafile.h

    r980 r981  
    351351    }
    352352
    353     static UINT Metafile::EmfToWmfBits(
     353    static UINT EmfToWmfBits(
    354354        IN HENHMETAFILE       hemf,
    355355        IN UINT               cbData16,
  • trunk/contrib/gdiplus/include/GdiplusStringFormat.h

    r980 r981  
    218218    }
    219219
    220     StringTrimming StringFormat::GetTrimming() const
     220    StringTrimming GetTrimming() const
    221221    {
    222222        StringTrimming trimming;
  • trunk/src/Makefile.am

    r965 r981  
    2828    image/image.cpp image/image.h image/image-private.h \
    2929    image/codec/android-image.cpp \
     30    image/codec/gdiplus-image.cpp \
    3031    image/codec/ios-image.cpp \
    3132    image/codec/sdl-image.cpp \
  • trunk/src/image/image.cpp

    r958 r981  
    2929#endif
    3030    REGISTER_IMAGE_LOADER(DummyImageData)
     31#if defined USE_GDIPLUS
     32    REGISTER_IMAGE_LOADER(GdiPlusImageData)
     33#endif
    3134#if defined __APPLE__ && defined __MACH__ && defined __arm__
    3235    REGISTER_IMAGE_LOADER(IosImageData)
Note: See TracChangeset for help on using the changeset viewer.