Changeset 981Tweet

Timestamp:

Sep 25, 2011, 12:21:54 AM (12 years ago)

Author:

sam

Message:

image: add a GDI+ loader.

Location:

trunk

Files:

• build/lol-build (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• contrib/gdiplus/include/GdiplusMetafile.h (modified) (1 diff)
• contrib/gdiplus/include/GdiplusStringFormat.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/image/codec/gdiplus-image.cpp (added)
• src/image/image.cpp (modified) (1 diff)

trunk/build/lol-build

@@ -81 +81 @@
             fi
             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
+            LDFLAGS="$LDFLAGS -L$PWD/contrib/gdiplus/lib"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
@@ -122 +123 @@
             ;;
         windows-i386|windows-amd64)
+            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gdiplus/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"

trunk/configure.ac

@@ -264 +264 @@
 
 
+dnl Use Windows GDI+?
+ac_cv_my_have_gdiplus="no"
+AC_LANG_PUSH(C++)
+AC_CHECK_HEADERS(Gdiplus.h,
+ [ac_cv_my_have_gdiplus="yes"
+  LOL_LIBS="${LOL_LIBS} -lgdiplus"],
+ [ac_cv_my_have_gdiplus="no"],
+ [#include <algorithm>
+  using std::min;
+  using std::max;
+  #include <windows.h>])
+AC_LANG_POP(C++)
+if test "${ac_cv_my_have_gdiplus}" != "no"; then
+  AC_DEFINE(USE_GDIPLUS, 1, Define to 1 to use GDI+)
+fi
+AM_CONDITIONAL(USE_GDIPLUS, test "${ac_cv_my_have_gdiplus}" = "yes")
+
+
 dnl Use libcaca? (required for font generation)
 ac_cv_my_have_caca="no"

trunk/contrib/gdiplus/include/GdiplusMetafile.h

@@ -351 +351 @@
     }
 
-    static UINT Metafile::EmfToWmfBits(
+    static UINT EmfToWmfBits(
         IN HENHMETAFILE       hemf,
         IN UINT               cbData16,

trunk/contrib/gdiplus/include/GdiplusStringFormat.h

@@ -218 +218 @@
     }
 
-    StringTrimming StringFormat::GetTrimming() const
+    StringTrimming GetTrimming() const
     {
         StringTrimming trimming;

trunk/src/Makefile.am

@@ -28 +28 @@
     image/image.cpp image/image.h image/image-private.h \
     image/codec/android-image.cpp \
+    image/codec/gdiplus-image.cpp \
     image/codec/ios-image.cpp \
     image/codec/sdl-image.cpp \

trunk/src/image/image.cpp

@@ -29 +29 @@
 #endif
     REGISTER_IMAGE_LOADER(DummyImageData)
+#if defined USE_GDIPLUS
+    REGISTER_IMAGE_LOADER(GdiPlusImageData)
+#endif
 #if defined __APPLE__ && defined __MACH__ && defined __arm__
     REGISTER_IMAGE_LOADER(IosImageData)